diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/MessageTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/MessageTypeEnum.java new file mode 100644 index 00000000..a68bd7d2 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/MessageTypeEnum.java @@ -0,0 +1,43 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 消息推送枚举 + * @Author 纪寒 + * @Date 2024-03-19 10:12:39 + * @Version 1.0 + */ +@Getter +public enum MessageTypeEnum { + /** + * 电话外呼 + */ + PHONE_OUTBOUND("PHONE_OUTBOUND"), + + /** + * 问卷量表 + */ + QUESTIONNAIRE_SCALE("QUESTIONNAIRE_SCALE"), + + /** + * 宣教文章 + */ + PROPAGANDA_ARTICLE("QUESTIONNAIRE_SCALE"), + + /** + * 文字提醒 + */ + TEXT_REMIND("TEXT_REMIND"), + + /** + * 人工随访 + */ + ARTIFICIAL_FOLLOW_UP("ARTIFICIAL_FOLLOW_UP"), + ; + final private String value; + + MessageTypeEnum(String value) { + this.value = value; + } +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/SubscribeStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/SubscribeStatusEnum.java new file mode 100644 index 00000000..43a1c468 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/SubscribeStatusEnum.java @@ -0,0 +1,28 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 订阅状态枚举 + * @Author 纪寒 + * @Date 2024-03-19 10:20:05 + * @Version 1.0 + */ +@Getter +public enum SubscribeStatusEnum { + /** + * 接受 + */ + ACCEPT("ACCEPT"), + + /** + * 拒绝 + */ + REJECT("REJECT"); + final private String value; + + SubscribeStatusEnum(String value) { + this.value = value; + } + +} diff --git a/postdischarge-generator/src/main/java/com/xinelu/generator/util/GenUtils.java b/postdischarge-generator/src/main/java/com/xinelu/generator/util/GenUtils.java index e52a12d9..26650a2a 100644 --- a/postdischarge-generator/src/main/java/com/xinelu/generator/util/GenUtils.java +++ b/postdischarge-generator/src/main/java/com/xinelu/generator/util/GenUtils.java @@ -167,7 +167,7 @@ public class GenUtils { * * @param replacementm 替换值 * @param searchList 替换列表 - * @return + * @return 文本结果 */ public static String replaceFirst(String replacementm, String[] searchList) { String text = replacementm; diff --git a/postdischarge-generator/src/main/java/com/xinelu/generator/util/VelocityUtils.java b/postdischarge-generator/src/main/java/com/xinelu/generator/util/VelocityUtils.java index 93f1527e..a09327e0 100644 --- a/postdischarge-generator/src/main/java/com/xinelu/generator/util/VelocityUtils.java +++ b/postdischarge-generator/src/main/java/com/xinelu/generator/util/VelocityUtils.java @@ -125,7 +125,7 @@ public class VelocityUtils { * @return 模板列表 */ public static List getTemplateList(String tplCategory) { - List templates = new ArrayList(); + List templates = new ArrayList<>(); templates.add("vm/java/domain.java.vm"); templates.add("vm/java/mapper.java.vm"); templates.add("vm/java/service.java.vm"); diff --git a/postdischarge-generator/src/main/resources/vm/java/mapper.java.vm b/postdischarge-generator/src/main/resources/vm/java/mapper.java.vm index 53dad760..d34bdf4e 100644 --- a/postdischarge-generator/src/main/resources/vm/java/mapper.java.vm +++ b/postdischarge-generator/src/main/resources/vm/java/mapper.java.vm @@ -20,7 +20,7 @@ public interface ${ClassName}Mapper { * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); /** * 查询${functionName}列表 diff --git a/postdischarge-generator/src/main/resources/vm/java/service.java.vm b/postdischarge-generator/src/main/resources/vm/java/service.java.vm index 3c78d9eb..a01b640c 100644 --- a/postdischarge-generator/src/main/resources/vm/java/service.java.vm +++ b/postdischarge-generator/src/main/resources/vm/java/service.java.vm @@ -17,7 +17,7 @@ public interface I${ClassName}Service { * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); /** * 查询${functionName}列表 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/subscribemessagerecord/SubscribeMessageRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/subscribemessagerecord/SubscribeMessageRecord.java index 5eff7800..f0f00142 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/subscribemessagerecord/SubscribeMessageRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/subscribemessagerecord/SubscribeMessageRecord.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.Date; +import java.time.LocalDateTime; /** * 微信小程序订阅消息记录对象 subscribe_message_record @@ -93,15 +93,15 @@ public class SubscribeMessageRecord extends BaseEntity { * 订阅时间 */ @ApiModelProperty(value = "订阅时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "订阅时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date subscribeTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "订阅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime subscribeTime; /** * 订阅状态,accept:接受,reject:拒绝 */ - @ApiModelProperty(value = "订阅状态,accept:接受,reject:拒绝") - @Excel(name = "订阅状态,accept:接受,reject:拒绝") + @ApiModelProperty(value = "订阅状态,ACCEPT:接受,REJECT:拒绝") + @Excel(name = "订阅状态,ACCEPT:接受,REJECT:拒绝") private String subscribeStatus; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/subscribemessagerecord/SubscribeMessageRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/subscribemessagerecord/SubscribeMessageRecordMapper.java new file mode 100644 index 00000000..ae155e63 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/subscribemessagerecord/SubscribeMessageRecordMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.subscribemessagerecord; + +import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord; + +import java.util.List; + +/** + * 微信小程序订阅消息记录Mapper接口 + * + * @author xinelu + * @date 2024-03-19 + */ +public interface SubscribeMessageRecordMapper { + /** + * 查询微信小程序订阅消息记录 + * + * @param id 微信小程序订阅消息记录主键 + * @return 微信小程序订阅消息记录 + */ + SubscribeMessageRecord selectSubscribeMessageRecordById(Long id); + + /** + * 查询微信小程序订阅消息记录列表 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 微信小程序订阅消息记录集合 + */ + List selectSubscribeMessageRecordList(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 新增微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + int insertSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 修改微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + int updateSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 删除微信小程序订阅消息记录 + * + * @param id 微信小程序订阅消息记录主键 + * @return 结果 + */ + int deleteSubscribeMessageRecordById(Long id); + + /** + * 批量删除微信小程序订阅消息记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteSubscribeMessageRecordByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/ISubscribeMessageRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/ISubscribeMessageRecordService.java new file mode 100644 index 00000000..ac244ec0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/ISubscribeMessageRecordService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.subscribemessagerecord; + +import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord; + +import java.util.List; + +/** + * 微信小程序订阅消息记录Service接口 + * + * @author xinelu + * @date 2024-03-19 + */ +public interface ISubscribeMessageRecordService { + /** + * 查询微信小程序订阅消息记录 + * + * @param id 微信小程序订阅消息记录主键 + * @return 微信小程序订阅消息记录 + */ + SubscribeMessageRecord selectSubscribeMessageRecordById(Long id); + + /** + * 查询微信小程序订阅消息记录列表 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 微信小程序订阅消息记录集合 + */ + List selectSubscribeMessageRecordList(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 新增微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + int insertSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 修改微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + int updateSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord); + + /** + * 批量删除微信小程序订阅消息记录 + * + * @param ids 需要删除的微信小程序订阅消息记录主键集合 + * @return 结果 + */ + int deleteSubscribeMessageRecordByIds(Long[] ids); + + /** + * 删除微信小程序订阅消息记录信息 + * + * @param id 微信小程序订阅消息记录主键 + * @return 结果 + */ + int deleteSubscribeMessageRecordById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/impl/SubscribeMessageRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/impl/SubscribeMessageRecordServiceImpl.java new file mode 100644 index 00000000..7319f48b --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/subscribemessagerecord/impl/SubscribeMessageRecordServiceImpl.java @@ -0,0 +1,90 @@ +package com.xinelu.manage.service.subscribemessagerecord.impl; + +import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord; +import com.xinelu.manage.mapper.subscribemessagerecord.SubscribeMessageRecordMapper; +import com.xinelu.manage.service.subscribemessagerecord.ISubscribeMessageRecordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 微信小程序订阅消息记录Service业务层处理 + * + * @author xinelu + * @date 2024-03-19 + */ +@Service +public class SubscribeMessageRecordServiceImpl implements ISubscribeMessageRecordService { + @Resource + private SubscribeMessageRecordMapper subscribeMessageRecordMapper; + + /** + * 查询微信小程序订阅消息记录 + * + * @param id 微信小程序订阅消息记录主键 + * @return 微信小程序订阅消息记录 + */ + @Override + public SubscribeMessageRecord selectSubscribeMessageRecordById(Long id) { + return subscribeMessageRecordMapper.selectSubscribeMessageRecordById(id); + } + + /** + * 查询微信小程序订阅消息记录列表 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 微信小程序订阅消息记录 + */ + @Override + public List selectSubscribeMessageRecordList(SubscribeMessageRecord subscribeMessageRecord) { + return subscribeMessageRecordMapper.selectSubscribeMessageRecordList(subscribeMessageRecord); + } + + /** + * 新增微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + @Override + public int insertSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord) { + subscribeMessageRecord.setCreateTime(LocalDateTime.now()); + return subscribeMessageRecordMapper.insertSubscribeMessageRecord(subscribeMessageRecord); + } + + /** + * 修改微信小程序订阅消息记录 + * + * @param subscribeMessageRecord 微信小程序订阅消息记录 + * @return 结果 + */ + @Override + public int updateSubscribeMessageRecord(SubscribeMessageRecord subscribeMessageRecord) { + subscribeMessageRecord.setUpdateTime(LocalDateTime.now()); + return subscribeMessageRecordMapper.updateSubscribeMessageRecord(subscribeMessageRecord); + } + + /** + * 批量删除微信小程序订阅消息记录 + * + * @param ids 需要删除的微信小程序订阅消息记录主键 + * @return 结果 + */ + @Override + public int deleteSubscribeMessageRecordByIds(Long[] ids) { + return subscribeMessageRecordMapper.deleteSubscribeMessageRecordByIds(ids); + } + + /** + * 删除微信小程序订阅消息记录信息 + * + * @param id 微信小程序订阅消息记录主键 + * @return 结果 + */ + @Override + public int deleteSubscribeMessageRecordById(Long id) { + return subscribeMessageRecordMapper.deleteSubscribeMessageRecordById(id); + } +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagerecord/SubscribeMessageRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagerecord/SubscribeMessageRecordMapper.xml new file mode 100644 index 00000000..8072f8ea --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagerecord/SubscribeMessageRecordMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, patient_id, manage_route_node_id, unionid, openid, applet_id, template_id, message_type, subscribe_count, subscribe_time, subscribe_status, create_by, create_time, update_by, update_time from subscribe_message_record + + + + + + + + insert into subscribe_message_record + + patient_id, + + manage_route_node_id, + + unionid, + + openid, + + applet_id, + + template_id, + + message_type, + + subscribe_count, + + subscribe_time, + + subscribe_status, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientId}, + + #{manageRouteNodeId}, + + #{unionid}, + + #{openid}, + + #{appletId}, + + #{templateId}, + + #{messageType}, + + #{subscribeCount}, + + #{subscribeTime}, + + #{subscribeStatus}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update subscribe_message_record + + patient_id = + #{patientId}, + + manage_route_node_id = + #{manageRouteNodeId}, + + unionid = + #{unionid}, + + openid = + #{openid}, + + applet_id = + #{appletId}, + + template_id = + #{templateId}, + + message_type = + #{messageType}, + + subscribe_count = + #{subscribeCount}, + + subscribe_time = + #{subscribeTime}, + + subscribe_status = + #{subscribeStatus}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from subscribe_message_record where id = #{id} + + + + delete from subscribe_message_record where id in + + #{id} + + + \ No newline at end of file