Merge remote-tracking branch 'origin/master'

pmapi/pom.xml

@@ -253,6 +253,11 @@
             <artifactId>easyexcel-core</artifactId>
             <version>3.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-file-starter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
     <!-- 打包 -->
     <!--配置环境的profile-->

pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BaseFieldConst.java

@@ -0,0 +1,18 @@
+package com.ningdatech.pmapi.common.constant;
+
+/**
+ * <p>
+ * 创建人修改人基础字段
+ * </p>
+ *
+ * @author WendyYang
+ * @since 17:17 2023/01/29
+ */
+public interface BaseFieldConst {
+
+    String CREATE_BY = "createBy";
+    String UPDATE_BY = "updateBy";
+    String CREATE_ON = "createOn";
+    String UPDATE_ON = "updateOn";
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java

@@ -19,7 +19,7 @@ public interface BizConst {
      */
     String LIMIT_1 = "limit 1";
 
-    String COOKIE_KEY = "ND_CAR_RENTAL_JSESSION";
+    String COOKIE_KEY = "ND_PROJECT_MANAGEMENT_JSESSION";
 
     /**
      * 一小时秒数

pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java

@@ -9,9 +9,9 @@ public class CommonConstant {
 
     public static final String COOKIE_KEY = "ND_JSESSION";
 
-    public static final Integer EXPORT_PAGE_NUMBER= 1;
+    public static final Integer EXPORT_PAGE_NUMBER = 1;
 
-    public static final Integer EXPORT_PAGE_SIZE= 100000;
+    public static final Integer EXPORT_PAGE_SIZE = 100000;
     public static final String CALL_STATUS = "status";
     public static final String CALL_STATUS_OK_VALUE = "ok";
 

pmapi/src/main/java/com/ningdatech/pmapi/common/handler/BaseFieldFillHandler.java

@@ -0,0 +1,48 @@
+package com.ningdatech.pmapi.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ningdatech.pmapi.user.util.LoginUserUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+import static com.ningdatech.pmapi.common.constant.BaseFieldConst.*;
+
+/**
+ * <p>
+ * 字段自动填充处理
+ * </p>
+ *
+ * @author WendyYang
+ * @since 17:20 2022/11/24
+ */
+@Slf4j
+@Component
+public class BaseFieldFillHandler implements MetaObjectHandler {
+
+    private Long getUserId() {
+        if (LoginUserUtil.isLogin()) {
+            return LoginUserUtil.getUserId();
+        }
+        return 0L;
+    }
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        long userId = getUserId();
+        LocalDateTime now = LocalDateTime.now();
+        this.fillStrategy(metaObject, CREATE_BY, userId);
+        this.fillStrategy(metaObject, CREATE_ON, now);
+        this.fillStrategy(metaObject, UPDATE_BY, userId);
+        this.fillStrategy(metaObject, UPDATE_ON, now);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.fillStrategy(metaObject, UPDATE_BY, getUserId());
+        this.fillStrategy(metaObject, UPDATE_ON, LocalDateTime.now());
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java

@@ -0,0 +1,39 @@
+package com.ningdatech.pmapi.common.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.ningdatech.basic.util.StrPool;
+import org.springframework.util.NumberUtils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * BizUtils
+ * </p>
+ *
+ * @author WendyYang
+ * @since 17:32 2023/1/29
+ */
+public class BizUtils {
+
+    private BizUtils() {
+
+    }
+
+    public static <T extends Number> List<T> splitToNum(String str, Class<T> aClass) {
+        if (StrUtil.isEmpty(str)) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(str.split(StrPool.COMMA))
+                .map(w -> NumberUtils.parseNumber(w, aClass))
+                .collect(Collectors.toList());
+    }
+
+    public static List<Long> splitToLong(String str) {
+        return splitToNum(str, Long.class);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java

@@ -35,8 +35,8 @@ public class OrganizationProcdefController {
     @ApiOperation(value = "单位流程配置列表", notes = "单位流程配置列表")
     @GetMapping("/list")
     public PageVo<OrgProcdefVo> list(@RequestParam String orgCode, @RequestParam(defaultValue = "1") Integer pageNum,
-                                            @RequestParam(defaultValue = "10") Integer pageSize) {
-        return orgProcdefService.getOrgProcessByOrgCode(orgCode,pageNum,pageSize);
+                                     @RequestParam(defaultValue = "10") Integer pageSize) {
+        return orgProcdefService.getOrgProcessByOrgCode(orgCode, pageNum, pageSize);
     }
 
     @ApiOperation(value = "单位流程配置详情", notes = "单位流程配置详情")
@@ -44,7 +44,7 @@ public class OrganizationProcdefController {
     public OrgProcdefVo detail(@PathVariable String procdefId) {
         WflowOrgModelHistorys lastVersionModel = orgProcessModelService.getLastVersionModel(procdefId);
         OrgProcdefVo vo = new OrgProcdefVo();
-        BeanUtils.copyProperties(lastVersionModel,vo);
+        BeanUtils.copyProperties(lastVersionModel, vo);
         return vo;
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java

@@ -10,4 +10,8 @@ import org.springframework.stereotype.Component;
 @Component
 @RequiredArgsConstructor
 public class OrganizationManage {
+
+//    private final
+
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/schedule/task/BatchUpdateOrganizationTask.java

@@ -0,0 +1,14 @@
+package com.ningdatech.pmapi.schedule.task;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author liuxinxin
+ * @date 2023/1/12 上午9:53
+ * 批量获取/更新部门信息任务
+ */
+@Component
+public class BatchUpdateOrganizationTask {
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java

@@ -16,6 +16,7 @@ import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO;
 import com.ningdatech.pmapi.sys.entity.vo.MenuVO;
 import com.ningdatech.pmapi.sys.manage.MenuManage;
 import com.ningdatech.pmapi.sys.service.IMenuService;
+import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -70,8 +71,7 @@ public class MenuController {
     @GetMapping("/myMenu")
     public List<MenuRoleVO> currentUserMenu() {
         List<Menu> list = menuService.list(Wrappers.lambdaQuery(Menu.class).orderByAsc(Menu::getSort));
-        // TODO:登录用户信息
-        return menuManage.buildUserMenu(list, null);
+        return menuManage.buildUserMenu(list, LoginUserUtil.loginUserDetail());
     }
 
     @ApiOperation(value = "查询菜单", notes = "查询菜单")
@@ -85,8 +85,7 @@ public class MenuController {
     @PostMapping("/save")
     @WebLog("保存菜单")
     public MenuVO handlerSave(@Valid @RequestBody MenuSaveDTO data) {
-        // todo:创建人ID
-        menuService.save(data, 0L);
+        menuService.save(data, LoginUserUtil.getUserId());
         return BeanUtil.toBean(data, MenuVO.class);
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NoticeController.java

@@ -0,0 +1,81 @@
+package com.ningdatech.pmapi.sys.controller;
+
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.log.annotation.WebLog;
+import com.ningdatech.pmapi.sys.entity.req.NoticeListReq;
+import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq;
+import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq;
+import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO;
+import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO;
+import com.ningdatech.pmapi.sys.manage.NoticeManage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 系统通知 前端控制器
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2022-07-21
+ */
+@RestController
+@Api(tags = "公告管理")
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/notice")
+public class NoticeController {
+
+    private final NoticeManage noticeManage;
+
+    @PostMapping("/save")
+    @ApiOperation("新增通知")
+    @WebLog("新增公告")
+    public IdVo<Long> save(@Valid @RequestBody NoticeSaveReq req) {
+        return noticeManage.saveOrModify(req);
+    }
+
+    @GetMapping("/detail/{id}")
+    @ApiOperation("通知详情")
+    public NoticeDetailVO save(@PathVariable Long id) {
+        return noticeManage.detail(id);
+    }
+
+    @PostMapping("/enabled")
+    @ApiOperation("启用禁用")
+    @WebLog("启用禁用")
+    public Boolean save(@Valid @RequestBody NoticeStatusModifyReq req) {
+        return noticeManage.changeEnabled(req);
+    }
+
+    @PostMapping("/topped")
+    @ApiOperation("置顶")
+    @WebLog("置顶")
+    public void topped(@RequestBody IdVo<Long> id) {
+        noticeManage.topped(id.getId());
+    }
+
+    @GetMapping("/dashboard/list")
+    @ApiOperation("工作台公告列表")
+    public PageVo<NoticeListItemVO> dashboardList(@RequestParam(required = false, defaultValue = "3") Integer limit) {
+        return noticeManage.dashboardList(limit);
+    }
+
+    @GetMapping("/manage/list")
+    @ApiOperation("公告管理列表")
+    public PageVo<NoticeListItemVO> listByManager(NoticeListReq req) {
+        return noticeManage.listByManager(req);
+    }
+
+    @DeleteMapping("/del")
+    @ApiOperation("删除公告")
+    @WebLog("删除公告")
+    public void delNotice(@RequestBody IdVo<Long> req) {
+        noticeManage.delNotice(req.getId());
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/RoleController.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ningdatech.basic.auth.AbstractLoginUserUtil;
+import cn.hutool.core.lang.Assert;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
 import com.ningdatech.pmapi.sys.entity.Role;
@@ -11,6 +11,7 @@ import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO;
 import com.ningdatech.pmapi.sys.entity.vo.RoleVO;
 import com.ningdatech.pmapi.sys.manage.RoleManage;
 import com.ningdatech.pmapi.sys.service.IRoleService;
+import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * <p>
@@ -58,34 +58,32 @@ public class RoleController {
     @GetMapping("/details")
     public RoleVO getDetails(@Valid @RequestParam Long id) {
         Role role = roleService.getById(id);
+        Assert.notNull(role, "角色不存在");
         RoleVO query = BeanUtil.toBean(role, RoleVO.class);
-        if (Objects.isNull(query)) {
-            return null;
-        }
-        //菜单
+        // 菜单
         roleManage.buildMenu(query);
         return query;
     }
 
     @ApiOperation(value = "保存新角色", notes = "保存新角色")
     @PostMapping("/save")
-    @WebLog
+    @WebLog("保存新角色")
     public RoleVO handlerSave(@Valid @RequestBody RoleSaveDTO data) {
-        roleService.saveRole(data, null);
+        roleService.saveRole(data, LoginUserUtil.getUserId());
         return BeanUtil.toBean(data, RoleVO.class);
     }
 
     @ApiOperation(value = "编辑角色", notes = "编辑角色")
     @PostMapping("/modify")
-    @WebLog
+    @WebLog("编辑角色")
     public RoleVO handlerUpdate(@Valid @RequestBody RoleUpdateDTO data) {
-        roleService.updateRole(data, AbstractLoginUserUtil.getUserId());
+        roleService.updateRole(data, LoginUserUtil.getUserId());
         return BeanUtil.toBean(data, RoleVO.class);
     }
 
     @ApiOperation(value = "删除角色", notes = "删除角色")
     @PostMapping("/remove")
-    @WebLog
+    @WebLog("删除角色")
     public Boolean handlerDelete(@Valid @RequestBody List<Long> ids) {
         return roleService.removeByIdWithCache(ids);
     }

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Notice.java

@@ -0,0 +1,67 @@
+package com.ningdatech.pmapi.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 系统通知
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2022-07-21
+ */
+@Data
+@TableName("nd_notice")
+@ApiModel(value = "SysNotice对象", description = "系统通知")
+public class Notice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型")
+    private Integer type;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("启用禁用")
+    private Boolean enabled;
+
+    @ApiModelProperty("附件ID")
+    private String attachment;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOn;
+
+    @ApiModelProperty("创建人id")
+    private Long createBy;
+
+    @ApiModelProperty("最后修改时间")
+    private LocalDateTime updateOn;
+
+    @ApiModelProperty("最后修改人")
+    private Long updateBy;
+
+    @ApiModelProperty("是否删除")
+    @TableLogic
+    private Boolean deleted;
+
+    @ApiModelProperty("置顶时间")
+    private LocalDateTime toppedTime;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeListReq.java

@@ -0,0 +1,31 @@
+package com.ningdatech.pmapi.sys.entity.req;
+
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * DashboardNoticeListPo
+ * </p>
+ *
+ * @author WendyYang
+ * @since 00:32 2022/7/23
+ */
+@Data
+@ApiModel("工作台消息列表查询")
+@EqualsAndHashCode(callSuper = true)
+public class NoticeListReq extends PagePo {
+
+    @ApiModelProperty("消息类型")
+    private Integer type;
+
+    @ApiModelProperty("公告标题")
+    private String title;
+
+    @ApiModelProperty("公告状态")
+    private Boolean enabled;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeSaveReq.java

@@ -0,0 +1,45 @@
+package com.ningdatech.pmapi.sys.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * MsgUpdatePo
+ * </p>
+ *
+ * @author WendyYang
+ * @since 21:35 2022/7/21
+ */
+@Data
+@ApiModel("消息新增实体")
+public class NoticeSaveReq {
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("通知标题")
+    @NotBlank(message = "通知标题不能为空")
+    private String title;
+
+    @ApiModelProperty("通知类型")
+    @NotNull(message = "通知类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty("通知内容")
+    @NotBlank(message = "通知内容不能为空")
+    private String content;
+
+    @ApiModelProperty("附件ID编码")
+    private String attachment;
+
+    @ApiModelProperty("是否启用")
+    @NotNull(message = "是否启用不能为空")
+    private Boolean enabled;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeStatusModifyReq.java

@@ -0,0 +1,29 @@
+package com.ningdatech.pmapi.sys.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * NoticeStatusUpdatePo
+ * </p>
+ *
+ * @author WendyYang
+ * @since 22:32 2022/7/22
+ */
+@Data
+@ApiModel("消息状态修改")
+public class NoticeStatusModifyReq {
+
+    @ApiModelProperty("ID")
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+    @ApiModelProperty("状态：true 启用、false 停用")
+    @NotNull(message = "状态不能为空")
+    private Boolean status;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/NoticeDetailVO.java

@@ -0,0 +1,40 @@
+package com.ningdatech.pmapi.sys.entity.vo;
+
+import com.ningdatech.file.entity.vo.result.AttachFileVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * NoticeDetailVo
+ * </p>
+ *
+ * @author WendyYang
+ * @since 16:56 2022/7/22
+ */
+@Data
+@ApiModel("公告详情")
+public class NoticeDetailVO {
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("状态")
+    private Boolean enabled;
+
+    @ApiModelProperty("公告类型")
+    private Integer type;
+
+    @ApiModelProperty("附件信息")
+    private List<AttachFileVo> attachments;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/NoticeListItemVO.java

@@ -0,0 +1,44 @@
+package com.ningdatech.pmapi.sys.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * ManageNoticeListItem
+ * </p>
+ *
+ * @author WendyYang
+ * @since 00:30 2022/7/23
+ */
+@Data
+@Builder
+public class NoticeListItemVO {
+
+    @Tolerate
+    public NoticeListItemVO() {
+    }
+
+    @ApiModelProperty("公告ID")
+    private Long id;
+
+    @ApiModelProperty("公告类型")
+    private Integer type;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOn;
+
+    @ApiModelProperty("是否启用")
+    private Boolean enabled;
+
+    @ApiModelProperty("是否置顶")
+    private Boolean topped;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NoticeManage.java

@@ -0,0 +1,109 @@
+package com.ningdatech.pmapi.sys.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.file.entity.vo.result.AttachFileVo;
+import com.ningdatech.file.service.FileService;
+import com.ningdatech.pmapi.common.utils.BizUtils;
+import com.ningdatech.pmapi.sys.entity.Notice;
+import com.ningdatech.pmapi.sys.entity.req.NoticeListReq;
+import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq;
+import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq;
+import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO;
+import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO;
+import com.ningdatech.pmapi.sys.service.INoticeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * MsgManage
+ * </p>
+ *
+ * @author WendyYang
+ * @since 21:30 2022/7/21
+ */
+@Component
+@RequiredArgsConstructor
+public class NoticeManage {
+
+    private final INoticeService noticeService;
+    private final FileService fileService;
+
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo<Long> saveOrModify(NoticeSaveReq req) {
+        Notice notice = BeanUtil.copyProperties(req, Notice.class);
+        noticeService.saveOrUpdate(notice);
+        return IdVo.of(notice.getId());
+    }
+
+    public NoticeDetailVO detail(Long id) {
+        Notice notice = noticeService.getById(id);
+        NoticeDetailVO detail = BeanUtil.copyProperties(notice, NoticeDetailVO.class);
+        List<Long> fileIds = BizUtils.splitToLong(notice.getAttachment());
+        if (!fileIds.isEmpty()) {
+            List<AttachFileVo> attachFiles = fileService.getByIds(fileIds);
+            detail.setAttachments(attachFiles);
+        }
+        return detail;
+    }
+
+    public boolean changeEnabled(NoticeStatusModifyReq req) {
+        Notice notice = new Notice();
+        notice.setId(req.getId());
+        notice.setEnabled(req.getStatus());
+        return noticeService.updateById(notice);
+    }
+
+    public void topped(Long id) {
+        Notice notice = new Notice();
+        notice.setId(id);
+        notice.setToppedTime(LocalDateTime.now());
+        noticeService.updateById(notice);
+    }
+
+
+    public PageVo<NoticeListItemVO> dashboardList(Integer limit) {
+        NoticeListReq req = new NoticeListReq();
+        req.setPageSize(limit);
+        req.setEnabled(true);
+        return listByManager(req);
+    }
+
+    public PageVo<NoticeListItemVO> listByManager(NoticeListReq req) {
+        LambdaQueryWrapper<Notice> wrapper = Wrappers.lambdaQuery(Notice.class)
+                .eq(req.getEnabled() != null, Notice::getEnabled, req.getEnabled())
+                .like(StrUtil.isNotBlank(req.getTitle()), Notice::getTitle, req.getTitle())
+                .eq(req.getType() != null, Notice::getType, req.getType())
+                .orderByDesc(Notice::getToppedTime, Notice::getUpdateOn);
+        Page<Notice> page = noticeService.page(req.page(), wrapper);
+        if (page.getTotal() == 0) {
+            return PageVo.empty();
+        }
+        List<NoticeListItemVO> tempDataList = CollUtils.convert(page.getRecords(), w -> NoticeListItemVO
+                .builder()
+                .id(w.getId())
+                .type(w.getType())
+                .title(w.getTitle())
+                .enabled(w.getEnabled())
+                .createOn(w.getCreateOn())
+                .topped(w.getToppedTime() != null)
+                .build());
+        return PageVo.of(tempDataList, page.getTotal());
+    }
+
+    public void delNotice(Long id) {
+        noticeService.removeById(id);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/NoticeMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.sys.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.sys.entity.Notice;
+
+/**
+ * <p>
+ * 系统通知 Mapper 接口
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2022-07-21
+ */
+public interface NoticeMapper extends BaseMapper<Notice> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/NoticeMapper.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.ningdatech.pmapi.sys.mapper.NoticeMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/INoticeService.java

@@ -0,0 +1,17 @@
+package com.ningdatech.pmapi.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.sys.entity.Notice;
+
+/**
+ * <p>
+ * 系统通知 服务类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2022-07-21
+ */
+public interface INoticeService extends IService<Notice> {
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/NoticeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.sys.entity.Notice;
+import com.ningdatech.pmapi.sys.mapper.NoticeMapper;
+import com.ningdatech.pmapi.sys.service.INoticeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统通知 服务实现类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2022-07-21
+ */
+@Service
+public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/model/UserInfoDetails.java

@@ -1,71 +0,0 @@
-package com.ningdatech.pmapi.user.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.ningdatech.basic.auth.AbstractLoginUser;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author LiuXinXin
- * @date 2022/8/1 下午3:32
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UserInfoDetails extends AbstractLoginUser implements UserDetails {
-
-    private static final long serialVersionUID = 1L;
-
-    private String nickName;
-
-    private String password;
-
-    private List<String> roleList;
-
-    private Integer dataScope;
-
-    private Long roleId;
-
-    private Long companyId;
-
-    private String companyName;
-
-    private Long regionId;
-
-    private String regionName;
-
-    /**
-     * 获取用户权限
-     */
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-}

pmapi/src/main/java/com/ningdatech/pmapi/user/util/LoginUserUtil.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.user.util;
 
 import com.ningdatech.basic.auth.AbstractLoginUserUtil;
-import com.ningdatech.pmapi.user.model.UserInfoDetails;
+import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 
 
 /**

pmapi/src/main/resources/application-dev.yml

@@ -90,6 +90,10 @@ spring:
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      logic-delete-value: true
+      logic-not-delete-value: false
 logging:
   config: classpath:logback-spring.xml
 #日志配置