소스 검색

短信配置基础代码提交

jingyuanchao 1 년 전
부모
커밋
08de6c8b6a
41개의 변경된 파일778개의 추가작업 그리고 14개의 파일을 삭제
  1. 73 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderConfiguration.java
  2. 38 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderConfigurationRole.java
  3. 63 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderLog.java
  4. 59 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderSchedule.java
  5. 50 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderTemplate.java
  6. 41 0
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/dto/ReminderConfigEditDto.java
  7. 1 1
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/BusinessPlanType.java
  8. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java
  9. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/controller/CompensateController.java
  10. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/dto/CompensateDto.java
  11. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/handel/CompensateHandel.java
  12. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/interfaces/CompensateService.java
  13. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java
  14. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java
  15. 37 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderConfigurationController.java
  16. 21 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderLogController.java
  17. 21 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderScheduleController.java
  18. 21 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderTemplateController.java
  19. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderConfigurationMapper.java
  20. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderConfigurationRoleMapper.java
  21. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderLogMapper.java
  22. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderScheduleMapper.java
  23. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderTemplateMapper.java
  24. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderConfigurationRoleService.java
  25. 19 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderConfigurationService.java
  26. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderLogService.java
  27. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderScheduleService.java
  28. 16 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderTemplateService.java
  29. 20 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderConfigurationRoleServiceImpl.java
  30. 72 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderConfigurationServiceImpl.java
  31. 20 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderLogServiceImpl.java
  32. 20 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderScheduleServiceImpl.java
  33. 20 0
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderTemplateServiceImpl.java
  34. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java
  35. 1 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java
  36. 5 0
      soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderConfigurationMapper.xml
  37. 5 0
      soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderConfigurationRoleMapper.xml
  38. 5 0
      soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderLogMapper.xml
  39. 5 0
      soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderScheduleMapper.xml
  40. 5 0
      soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderTemplateMapper.xml
  41. 4 4
      soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/CodeGenerators.java

+ 73 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderConfiguration.java

@@ -0,0 +1,73 @@
+package com.xunmei.common.core.domain.reminder.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;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("core_reminder_configuration")
+@ApiModel(value = "CoreReminderConfiguration对象", description = "")
+public class CoreReminderConfiguration implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "配置ID")
+    @TableId("config_id")
+    private Long configId;
+
+    @ApiModelProperty(value = "提醒类型(0:逾期提醒、1:临期提醒)")
+    @TableField("reminder_type")
+    private Integer reminderType;
+
+    /**
+     * @see com.xunmei.common.core.enums.BusinessPlanType
+     */
+    @ApiModelProperty(value = "发送模块")
+    @TableField("send_module")
+    private String sendModule;
+
+    @ApiModelProperty(value = "发送目标组织机构")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "发送目标组织机构")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "发送目标组织机构")
+    @TableField("org_path")
+    private String orgPath;
+
+    @ApiModelProperty(value = "发送目标机构类型")
+    @TableField("org_type")
+    private Integer orgType;
+
+    @ApiModelProperty(value = "临期时间(以天数表示)")
+    @TableField("advance_notice_period")
+    private Integer advanceNoticePeriod;
+
+    @ApiModelProperty(value = "逾期时间(以天数表示)")
+    @TableField("overdue_notice_period")
+    private Integer overdueNoticePeriod;
+
+    @ApiModelProperty(value = "是否启用该提醒配置")
+    @TableField("enabled")
+    private Boolean enabled;
+
+
+}

+ 38 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderConfigurationRole.java

@@ -0,0 +1,38 @@
+package com.xunmei.common.core.domain.reminder.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("core_reminder_configuration_role")
+@ApiModel(value="CoreReminderConfigurationRole对象", description="")
+public class CoreReminderConfigurationRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("config_id")
+    private Long configId;
+
+    @TableField("target_role_id")
+    private Long targetRoleId;
+
+    @TableField("target_role_name")
+    private String targetRoleName;
+
+
+}

+ 63 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderLog.java

@@ -0,0 +1,63 @@
+package com.xunmei.common.core.domain.reminder.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-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("core_reminder_log")
+@ApiModel(value="CoreReminderLog对象", description="")
+public class CoreReminderLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日志ID")
+    @TableId("log_id")
+    private Long logId;
+
+    @ApiModelProperty(value = "关联的提醒任务ID")
+    @TableField("schedule_id")
+    private Long scheduleId;
+
+    @ApiModelProperty(value = "目标接收者id")
+    @TableField("recipient_id")
+    private Long recipientId;
+
+    @ApiModelProperty(value = "目标接收者名称")
+    @TableField("recipient_name")
+    private String recipientName;
+
+    @ApiModelProperty(value = "实际发送的短信内容")
+    @TableField("message_content")
+    private String messageContent;
+
+    @ApiModelProperty(value = "发送时间")
+    @TableField("send_time")
+    private LocalDateTime sendTime;
+
+    @ApiModelProperty(value = "发送结果代码")
+    @TableField("result_code")
+    private String resultCode;
+
+    @ApiModelProperty(value = "发送结果描述")
+    @TableField("result_description")
+    private String resultDescription;
+
+
+}

+ 59 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderSchedule.java

@@ -0,0 +1,59 @@
+package com.xunmei.common.core.domain.reminder.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-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("core_reminder_schedule")
+@ApiModel(value="CoreReminderSchedule对象", description="")
+public class CoreReminderSchedule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    @TableId("schedule_id")
+    private Long scheduleId;
+
+    @ApiModelProperty(value = "关联的提醒配置ID")
+    @TableField("config_id")
+    private Long configId;
+
+    @ApiModelProperty(value = "目标接收者(手机号码或用户ID)")
+    @TableField("recipient")
+    private String recipient;
+
+    @ApiModelProperty(value = "计划发送时间")
+    @TableField("scheduled_time")
+    private LocalDateTime scheduledTime;
+
+    @ApiModelProperty(value = "任务状态(未发送、已发送、发送失败等)")
+    @TableField("status")
+    private String status;
+
+    @ApiModelProperty(value = "实际发送时间(若已发送)")
+    @TableField("sent_time")
+    private LocalDateTime sentTime;
+
+    @ApiModelProperty(value = "重试次数(用于处理发送失败情况)")
+    @TableField("retry_count")
+    private Integer retryCount;
+
+
+}

+ 50 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderTemplate.java

@@ -0,0 +1,50 @@
+package com.xunmei.common.core.domain.reminder.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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("core_reminder_template")
+@ApiModel(value="CoreReminderTemplate对象", description="")
+public class CoreReminderTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模板ID")
+    @TableId("template_id")
+    private Long templateId;
+
+    @ApiModelProperty(value = "提醒类型(与 core_reminder_configuration 关联)")
+    @TableField("reminder_type")
+    private Integer reminderType;
+
+    @ApiModelProperty(value = "模板名称")
+    @TableField("template_name")
+    private String templateName;
+
+    @ApiModelProperty(value = "提醒短信具体内容(支持变量替换)")
+    @TableField("template_content")
+    private String templateContent;
+
+    @ApiModelProperty(value = "模板语言")
+    @TableField("language")
+    private String language;
+
+
+}

+ 41 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/dto/ReminderConfigEditDto.java

@@ -0,0 +1,41 @@
+package com.xunmei.common.core.domain.reminder.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+@Data
+public class ReminderConfigEditDto {
+
+    @ApiModelProperty(value = "提醒配置ID")
+    private Long configId;
+
+    @ApiModelProperty(value = "提醒类型(0:逾期提醒、1:临期提醒)")
+    @NotNull(message = "提醒类型不能为空")
+    private Integer reminderType;
+
+    /**
+     * @see com.xunmei.common.core.enums.BusinessPlanType
+     */
+    @NotNull(message = "业务类型不能为空")
+    @ApiModelProperty(value = "发送模块")
+    private String sendModule;
+
+    @NotNull(message = "发送目标不能为空")
+    @ApiModelProperty(value = "发送目标组织机构")
+    private Long orgId;
+
+    @NotNull(message = "天数不能为空")
+    @ApiModelProperty(value = "天数")
+    private Integer day;
+
+    @NotNull(message = "是否启用不能为空")
+    private Boolean enabled = true;
+
+    @Size(message = "角色不能为空",min = 1)
+    private List<Long> roleIdList;
+}

+ 1 - 1
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/enums/BusinessPlanType.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/BusinessPlanType.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.api.enums;
+package com.xunmei.common.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -48,7 +48,7 @@ import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskBuilderServ
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.system.api.*;
 import com.xunmei.system.api.domain.*;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.vo.SysOrgVO;
 import io.netty.util.internal.StringUtil;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/controller/CompensateController.java

@@ -4,7 +4,7 @@ package com.xunmei.core.compense.controller;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.compense.dto.CompensateDto;
 import com.xunmei.core.compense.handel.CompensateHandel;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/dto/CompensateDto.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class CompensateDto {
 
     /**
-     * @see com.xunmei.system.api.enums.BusinessPlanType
+     * @see com.xunmei.common.core.enums.BusinessPlanType
      */
     @NotNull(message = "补偿类型不能为空")
     @ApiModelProperty(value = "补偿编码")

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/handel/CompensateHandel.java

@@ -2,7 +2,7 @@ package com.xunmei.core.compense.handel;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.xunmei.core.compense.interfaces.CompensateService;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/compense/interfaces/CompensateService.java

@@ -1,7 +1,7 @@
 package com.xunmei.core.compense.interfaces;
 
 import com.xunmei.core.compense.dto.CompensateDto;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 public interface CompensateService {

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -52,7 +52,7 @@ import com.xunmei.core.drill.service.ICoreDrillTaskService;
 import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.vo.SysOrgVO;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -56,7 +56,7 @@ import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.vo.SysOrgVO;
 import lombok.extern.slf4j.Slf4j;

+ 37 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderConfigurationController.java

@@ -0,0 +1,37 @@
+package com.xunmei.core.reminder.controller;
+
+
+import com.xunmei.common.core.domain.reminder.dto.ReminderConfigEditDto;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.core.reminder.service.ICoreReminderConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@RestController
+@RequestMapping("/reminder/")
+public class CoreReminderConfigurationController {
+
+    @Autowired
+    private ICoreReminderConfigurationService configurationService;
+
+    @RequestMapping("/config")
+    public AjaxResult addConfig(@RequestBody @Valid ReminderConfigEditDto editDto) {
+        configurationService.editConfig(editDto);
+        return AjaxResult.success();
+
+    }
+
+}
+

+ 21 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderLogController.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.reminder.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@RestController
+@RequestMapping("/com.xunmei.core.reminder/coreReminderLog")
+public class CoreReminderLogController {
+
+}
+

+ 21 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderScheduleController.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.reminder.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@RestController
+@RequestMapping("/com.xunmei.core.reminder/coreReminderSchedule")
+public class CoreReminderScheduleController {
+
+}
+

+ 21 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/controller/CoreReminderTemplateController.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.reminder.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@RestController
+@RequestMapping("/com.xunmei.core.reminder/coreReminderTemplate")
+public class CoreReminderTemplateController {
+
+}
+

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderConfigurationMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfiguration;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface CoreReminderConfigurationMapper extends BaseMapper<CoreReminderConfiguration> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderConfigurationRoleMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.mapper;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfigurationRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface CoreReminderConfigurationRoleMapper extends BaseMapper<CoreReminderConfigurationRole> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderLogMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.mapper;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface CoreReminderLogMapper extends BaseMapper<CoreReminderLog> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderScheduleMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.mapper;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderSchedule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface CoreReminderScheduleMapper extends BaseMapper<CoreReminderSchedule> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/mapper/CoreReminderTemplateMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.mapper;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface CoreReminderTemplateMapper extends BaseMapper<CoreReminderTemplate> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderConfigurationRoleService.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.service;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfigurationRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface ICoreReminderConfigurationRoleService extends IService<CoreReminderConfigurationRole> {
+
+}

+ 19 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderConfigurationService.java

@@ -0,0 +1,19 @@
+package com.xunmei.core.reminder.service;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfiguration;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.reminder.dto.ReminderConfigEditDto;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface ICoreReminderConfigurationService extends IService<CoreReminderConfiguration> {
+
+    void editConfig(ReminderConfigEditDto editDto);
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderLogService.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.service;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface ICoreReminderLogService extends IService<CoreReminderLog> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderScheduleService.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.service;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderSchedule;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface ICoreReminderScheduleService extends IService<CoreReminderSchedule> {
+
+}

+ 16 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/ICoreReminderTemplateService.java

@@ -0,0 +1,16 @@
+package com.xunmei.core.reminder.service;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+public interface ICoreReminderTemplateService extends IService<CoreReminderTemplate> {
+
+}

+ 20 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderConfigurationRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.core.reminder.service.impl;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfigurationRole;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.core.reminder.mapper.CoreReminderConfigurationRoleMapper;
+import com.xunmei.core.reminder.service.ICoreReminderConfigurationRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Service
+public class CoreReminderConfigurationRoleServiceImpl extends ServiceImpl<CoreReminderConfigurationRoleMapper, CoreReminderConfigurationRole> implements ICoreReminderConfigurationRoleService {
+
+}

+ 72 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderConfigurationServiceImpl.java

@@ -0,0 +1,72 @@
+package com.xunmei.core.reminder.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfiguration;
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderConfigurationRole;
+import com.xunmei.common.core.domain.reminder.dto.ReminderConfigEditDto;
+import com.xunmei.common.core.vo.IdNameVo;
+import com.xunmei.core.reminder.mapper.CoreReminderConfigurationMapper;
+import com.xunmei.core.reminder.mapper.CoreReminderConfigurationRoleMapper;
+import com.xunmei.core.reminder.service.ICoreReminderConfigurationService;
+import com.xunmei.system.api.Eto.RoleConditionEto;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.RemoteRoleService;
+import com.xunmei.system.api.domain.SysOrg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Service
+public class CoreReminderConfigurationServiceImpl extends ServiceImpl<CoreReminderConfigurationMapper, CoreReminderConfiguration> implements ICoreReminderConfigurationService {
+    @Autowired
+    private RemoteOrgService orgService;
+    @Autowired
+    private RemoteRoleService roleService;
+    @Autowired
+    private CoreReminderConfigurationRoleMapper configurationRoleMapper;
+
+    @Override
+    public void editConfig(ReminderConfigEditDto editDto) {
+        SysOrg sysOrg = orgService.selectOrgById(editDto.getOrgId(), SecurityConstants.INNER);
+        List<IdNameVo> names = roleService.getNames(new RoleConditionEto(editDto.getRoleIdList()));
+        if (editDto.getConfigId() == null) {
+            CoreReminderConfiguration config = new CoreReminderConfiguration();
+            //生成config所有字段的set方法
+            config.setConfigId(IdWorker.getId());
+            config.setReminderType(editDto.getReminderType());
+            config.setSendModule(editDto.getSendModule());
+            config.setOrgId(editDto.getOrgId());
+            config.setOrgName(sysOrg.getName());
+            config.setOrgPath(sysOrg.getPath());
+            config.setOrgType(sysOrg.getType());
+            if (editDto.getReminderType() == 0) {
+                config.setOverdueNoticePeriod(editDto.getDay());
+            } else {
+                config.setAdvanceNoticePeriod(editDto.getDay());
+            }
+            config.setEnabled(editDto.getEnabled());
+            save(config);
+            for (Long roleId : editDto.getRoleIdList()) {
+                CoreReminderConfigurationRole configurationRole = new CoreReminderConfigurationRole();
+                configurationRole.setTargetRoleId(roleId);
+                names.stream().filter(idNameVo -> idNameVo.getId().equals(roleId)).findAny().ifPresent(idNameVo -> {
+                    configurationRole.setTargetRoleName(idNameVo.getName());
+                });
+                configurationRole.setConfigId(config.getConfigId());
+                configurationRoleMapper.insert(configurationRole);
+            }
+        }
+
+    }
+}

+ 20 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.core.reminder.service.impl;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderLog;
+import com.xunmei.core.reminder.mapper.CoreReminderLogMapper;
+import com.xunmei.core.reminder.service.ICoreReminderLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Service
+public class CoreReminderLogServiceImpl extends ServiceImpl<CoreReminderLogMapper, CoreReminderLog> implements ICoreReminderLogService {
+
+}

+ 20 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderScheduleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.core.reminder.service.impl;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderSchedule;
+import com.xunmei.core.reminder.mapper.CoreReminderScheduleMapper;
+import com.xunmei.core.reminder.service.ICoreReminderScheduleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Service
+public class CoreReminderScheduleServiceImpl extends ServiceImpl<CoreReminderScheduleMapper, CoreReminderSchedule> implements ICoreReminderScheduleService {
+
+}

+ 20 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderTemplateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.core.reminder.service.impl;
+
+import com.xunmei.common.core.domain.reminder.domain.CoreReminderTemplate;
+import com.xunmei.core.reminder.mapper.CoreReminderTemplateMapper;
+import com.xunmei.core.reminder.service.ICoreReminderTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-04-12
+ */
+@Service
+public class CoreReminderTemplateServiceImpl extends ServiceImpl<CoreReminderTemplateMapper, CoreReminderTemplate> implements ICoreReminderTemplateService {
+
+}

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -53,7 +53,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.ResumptionPdf;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.vo.QuestionPdfVo;
 import com.xunmei.system.api.vo.SysOrgVO;

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -54,7 +54,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.CheckDataVo;
 import com.xunmei.system.api.domain.SafeCheckTaskRegisterBookVo;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.enums.BusinessPlanType;
+import com.xunmei.common.core.enums.BusinessPlanType;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.vo.SysOrgVO;
 import io.netty.util.internal.StringUtil;

+ 5 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderConfigurationMapper.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.core.reminder.mapper.CoreReminderConfigurationMapper">
+
+</mapper>

+ 5 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderConfigurationRoleMapper.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.core.reminder.mapper.CoreReminderConfigurationRoleMapper">
+
+</mapper>

+ 5 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderLogMapper.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.core.reminder.mapper.CoreReminderLogMapper">
+
+</mapper>

+ 5 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderScheduleMapper.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.core.reminder.mapper.CoreReminderScheduleMapper">
+
+</mapper>

+ 5 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/reminder/CoreReminderTemplateMapper.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.core.reminder.mapper.CoreReminderTemplateMapper">
+
+</mapper>

+ 4 - 4
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.mediator";
-    public static final String tableNames="iot_sensor_data,iot_sensor_data_log";
+    public static final String moduleName="com.xunmei.core.reminder";
+    public static final String tableNames="core_reminder_configuration_role";
 
     public static void main(String[] args) {
         // 代码生成器
@@ -38,10 +38,10 @@ public class CodeGenerators {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         // System.getProperty("user.dir");
-        String projectPath = "D:\\test";
+        String projectPath = "/Users/jingyuanchao/Downloads";
         //生成文件输出目录
         gc.setOutputDir(projectPath + "/java");
-        gc.setAuthor("oygj");
+        gc.setAuthor("jingYuanChao");
         //生成代码后,是否打开文件夹
         gc.setOpen(true);
         // 实体属性 Swagger2 注解