```修复数据权限相关问题和优化生日提醒功能

- 在部门控制器的`getCompanyDept`方法中禁用数据权限。
- 在`NoticeConvert`中添加默认的生日提醒消息内容转换方法。
- 更新`RpcConfiguration`,引入`BpmOAGoOutApi`。
- 扩展`UserSaveReqVO`,添加用户性质字段。
```
This commit is contained in:
furongxin 2024-09-12 19:34:27 +08:00
parent f4171be128
commit 256fce51c9
4 changed files with 44 additions and 1 deletions

View File

@ -178,6 +178,7 @@ public class DeptController {
@GetMapping("/getCompanyDept")
@Operation(summary = "获取部门类型为公司的部门信息")
@DataPermission(enable = false)
public CommonResult<List<DeptSimpleRespVO>> getCompanyDept() {
List<DeptDO> list = deptService.getCompanyDept();

View File

@ -71,6 +71,9 @@ public class UserSaveReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate birthdayDay;
@Schema(description = "用户性质", example = "1")
private Integer userStaffing;
// ========== 创建需要传递的字段 ==========
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")

View File

@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
/**
@ -70,4 +72,40 @@ public interface NoticeConvert {
message.setPage("/subPages/notice/detail?id=" + notice.getId());
return message;
}
default SubscribeMessageReqDTO convertBirthday(String openId, String miniProgramState) {
SubscribeMessageReqDTO message = new SubscribeMessageReqDTO();
message.setToUser(openId);
message.setTemplateId("fH29xjNb8pe-7onQ-wE3QrBAC-y8aaC_oosYZKNMtzM");
//消息类型
MsgData noticeType = new MsgData();
noticeType.setName("phrase8");
noticeType.setValue("生日提醒");
message.addData(noticeType);
//发送人
MsgData publishMan = new MsgData();
publishMan.setName("thing16");
publishMan.setValue("系统");
message.addData(publishMan);
//发送时间
MsgData createTime = new MsgData();
createTime.setName("time3");
createTime.setValue(DateUtils.dateFormat(new Date(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
message.addData(createTime);
//消息内容
MsgData content = new MsgData();
content.setName("thing2");
content.setValue("今天有人过生日请前往PC端查看");
message.addData(content);
message.setMiniprogramState(miniProgramState);
message.setPage("");
return message;
}
}

View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.framework.rpc.config;
import cn.iocoder.yudao.module.bpm.api.model.BpmModelApi;
import cn.iocoder.yudao.module.bpm.api.oa.BpmOAGoOutApi;
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.FactoryInfoApi;
@ -8,6 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, FactoryInfoApi.class, BpmModelApi.class})
@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, FactoryInfoApi.class, BpmModelApi.class, BpmOAGoOutApi.class})
public class RpcConfiguration {
}