From d22b4581eeba3694cbabad6b1df1750283641166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Fri, 24 Sep 2021 16:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/CompanyMessageEnums.java | 24 ++++++------- .../common/enums/ManagementMessageEnums.java | 18 +++++----- .../java/com/jero/home/HomeController.java | 34 +++++++++++++++++++ .../message/entity/SysMessageTemplate.java | 1 + 4 files changed, 56 insertions(+), 21 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index 8e2941b4..8cb01203 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -12,18 +12,18 @@ import org.apache.commons.lang3.StringUtils; */ public enum CompanyMessageEnums { - MSG1("HYTZ_WORK_GROUP_CREATE","会议提醒"),//点击跳转到报名页面，meetingName，busId - MSG2("HYTZ_WORK_GROUP_SIGN_UP","会议提醒"),//弹窗：查看该会议详情，meetingName - MSG3("HYTZ_WORK_GROUP_UPLOAD","会议提醒"),//弹窗：查看该会议详情，meetingName - MSG4("HYTZ_WORK_GROUP_NOT_UPLOAD","会议提醒"),//弹窗：查看该会议详情，meetingName - MSG5("HYTZ_NOT_AUDIT","会议提醒"),//弹窗：上传汇款凭证，meetingName - MSG6("HYTZ_AUDIT","会议提醒"),//弹窗：查看该会议详情，meetingName - MSG7("WJTZ_MEETING_SEND","文件提醒"),//弹窗：查看该会议详情，meetingName - MSG8("HTTZ_PHASE","合同提醒"),//无，contract，num，amount - MSG9("YJTZ_MAIL","邮寄提醒"),//查看该物流信息，projectName - MSG10("YJTZ_MAIL_CONTRACT","邮寄提醒"),//查看该物流信息，contractName - MSG11("CKTZ_PAY","催款提醒"),//弹窗：查看该项目详情，projectName - MSG12("WJTZ_WORK_GROUP_SEND","文件提醒");//弹窗：查看该项目详情，workGroupName + MSG1("HYTZ_WORK_GROUP_CREATE","会议通知"),//点击跳转到报名页面，meetingName，busId + MSG2("HYTZ_WORK_GROUP_SIGN_UP","会议通知"),//弹窗：查看该会议详情，meetingName + MSG3("HYTZ_WORK_GROUP_UPLOAD","会议通知"),//弹窗：查看该会议详情，meetingName + MSG4("HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知"),//弹窗：查看该会议详情，meetingName + MSG5("HYTZ_NOT_AUDIT","会议通知"),//弹窗：上传汇款凭证，meetingName + MSG6("HYTZ_AUDIT","会议通知"),//弹窗：查看该会议详情，meetingName + MSG7("WJTZ_MEETING_SEND","文件通知"),//弹窗：查看该会议详情，meetingName + MSG8("HTTZ_PHASE","合同通知"),//无，contract，num，amount + MSG9("YJTZ_MAIL","邮寄通知"),//查看该物流信息，projectName + MSG10("YJTZ_MAIL_CONTRACT","邮寄通知"),//查看该物流信息，contractName + MSG11("CKTZ_PAY","催款通知"),//弹窗：查看该项目详情，projectName + MSG12("WJTZ_WORK_GROUP_SEND","文件通知");//弹窗：查看该项目详情，workGroupName private String code; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java index 4a43ea49..b8b01ad0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java @@ -11,15 +11,15 @@ import org.apache.commons.lang3.StringUtils; */ public enum ManagementMessageEnums { - MSG1("HTTZ_CREATE_PROJECT","项目提醒"),// 查看详情,projectName - MSG2("HTTZ_SUBMIT","合同提醒"),// 跳转到合同的详情页面,contractNum,contractName - MSG3("HTTZ_AUDIT","合同提醒"),//跳转到合同的详情页面,contractNum,contractName - MSG4("HTTZ_NOT_AUDIT","合同提醒"),//跳转到合同的详情页面,contractNum,contractName - MSG5("HYTZ_SIGN_UP_UPLOAD","会议提醒"),//审核弹窗 - MSG6("DBTZ_ADD","打包提醒"),//查看该项目详情，projectName - MSG7("DBTZ_CONTRACT","打包提醒"),//查看项目详情，projectName - MSG8("HYTZ_ON_ACCESS_UPDATE","会议提醒"),//查看该参会人详情，meetingName，username1，username2 - MSG9("QYTZ_CREATE","企业提醒");//企业列表页 + MSG1("HTTZ_CREATE_PROJECT","项目通知"),// 查看详情,projectName + MSG2("HTTZ_SUBMIT","合同通知"),// 跳转到合同的详情页面,contractNum,contractName + MSG3("HTTZ_AUDIT","合同通知"),//跳转到合同的详情页面,contractNum,contractName + MSG4("HTTZ_NOT_AUDIT","合同通知"),//跳转到合同的详情页面,contractNum,contractName + MSG5("HYTZ_SIGN_UP_UPLOAD","会议通知"),//审核弹窗 + MSG6("DBTZ_ADD","打包通知"),//查看该项目详情，projectName + MSG7("DBTZ_CONTRACT","打包通知"),//查看项目详情，projectName + MSG8("HYTZ_ON_ACCESS_UPDATE","会议通知"),//查看该参会人详情，meetingName，username1，username2 + MSG9("QYTZ_CREATE","企业通知");//企业列表页 private String code; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java new file mode 100644 index 00000000..dd5afc47 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java @@ -0,0 +1,34 @@ +package com.jero.home; + +import com.jero.common.api.vo.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * @Description: 首页 + * @Author: jeecg-boot + * @Date: 2021-09-24 + * @Version: V1.0 + */ +@Api(tags="首页") +@RestController +@RequestMapping("/home") +@Slf4j +public class HomeController { + + /** + * 首页-数据统计 + * + * @return + */ + @ApiOperation(value="首页-数据统计", notes="首页-数据统计") + @GetMapping(value = "/dataStatistics") + public Result dataStatistics() { + return null; + } +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java index 165b967a..cf956cb1 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java @@ -36,5 +36,6 @@ public class SysMessageTemplate extends JeroEntity { private java.lang.String templateTestJson; /**模板类型*/ @Excel(name = "模板类型", width = 15) + @Dict(dicCode = "msgType") private java.lang.String templateType; }