json

pom.xml

@@ -97,6 +97,12 @@
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
             <version>${liteflow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>cn.hutool</groupId>
+                    <artifactId>hutool-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--Java图形验证码，支持gif、中文、算术等类型:https://gitee.com/ele-admin/EasyCaptcha-->

src/main/java/com/xjrsoft/common/utils/RedisUtil.java

@@ -139,7 +139,8 @@ public class RedisUtil {
                 object instanceof Double || object instanceof Boolean || object instanceof String) {
             return String.valueOf(object);
         }
-        return JSONUtil.toJsonStr(object);
+        return GSON.toJson(object);
+//        return JSONUtil.toJsonStr(object);
     }
 
     /**
@@ -153,6 +154,6 @@ public class RedisUtil {
      * JSON数据，转成Object
      */
     private <T> T fromJson(String json, TypeReference<T> typeReference) {
-        return JSONUtil.toBean(json, typeReference, false);
+        return JSONUtil.toBean(json, typeReference, true);
     }
 }

src/main/java/com/xjrsoft/module/liteflow/node/WfOaPullNode.java

@@ -25,9 +25,8 @@ public class WfOaPullNode extends NodeComponent {
         Map<String, Object> params = this.getFirstContextBean();
         Long formId = util.getFormDataId(params);
         if (formId != null) {
-
+            // 数据处理
+            fileReceiveService.pullDataCache(formId);
         }
-
-        System.out.println("wf_oa_pull_node");
     }
 }

src/main/java/com/xjrsoft/module/liteflow/node/WfOaPushNode.java

@@ -1,15 +1,27 @@
 package com.xjrsoft.module.liteflow.node;
 
+import com.xjrsoft.module.oa.service.IFileReceiveService;
 import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * 发文流程结束处理
  */
 @Component("wf_oa_push_node")
 public class WfOaPushNode extends NodeComponent {
+    @Autowired
+    private IFileReceiveService fileReceiveService;
     @Override
     public void process() throws Exception {
-        System.out.println("wf_oa_push_node");
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Long formId = util.getFormDataId(params);
+        if (formId != null) {
+            // 数据处理
+            fileReceiveService.pushDataCache(formId);
+        }
     }
 }

src/main/java/com/xjrsoft/module/oa/controller/FileReceiveController.java

@@ -1,27 +1,38 @@
 package com.xjrsoft.module.oa.controller;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.authority.vo.DataAuthListVo;
 import com.xjrsoft.module.oa.dto.AddFileReceiveDto;
+import com.xjrsoft.module.oa.dto.FileReceivePullPageDto;
 import com.xjrsoft.module.oa.dto.UpdateFileReceiveDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
-import com.xjrsoft.module.oa.dto.FileReceivePageDto;
 import com.xjrsoft.module.oa.entity.FileReceive;
+import com.xjrsoft.module.oa.entity.Message;
+import com.xjrsoft.module.oa.entity.WfOaPull;
 import com.xjrsoft.module.oa.service.IFileReceiveService;
-import com.xjrsoft.module.oa.vo.FileReceivePageVo;
 
-import com.xjrsoft.module.oa.vo.FileReceiveVo;
+import com.xjrsoft.module.oa.service.IWfOaPullService;
+import com.xjrsoft.module.oa.service.IWfOaPushService;
+import com.xjrsoft.module.oa.vo.FileReceivePullPageVo;
+import com.xjrsoft.module.oa.vo.FileReceivePullVo;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -32,71 +43,65 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
-* @title: 文件接收管理
-* @Author fanxp
-* @Date: 2023-11-03
-* @Version 1.0
-*/
+ * @title: 文件接收管理
+ * @Author fanxp
+ * @Date: 2023-11-03
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/oa" + "/filereceive")
-@Api(value = "/oa"  + "/filereceive",tags = "文件接收管理代码")
+@Api(value = "/oa" + "/filereceive", tags = "文件接收管理代码")
 @AllArgsConstructor
 public class FileReceiveController {
 
 
     private final IFileReceiveService fileReceiveService;
 
-    @GetMapping(value = "/page")
-    @ApiOperation(value="文件接收管理列表(分页)")
+    private final IWfOaPullService wfOaPullService;
+
+    private final IWfOaPushService wfOaPushService;
+
+    private final IFileService fileService;
+
+    @GetMapping(value = "/pullpage")
+    @ApiOperation(value = "收文查询(分页)")
     @SaCheckPermission("filereceive:detail")
-    public RT<PageOutput<FileReceivePageVo>> page(@Valid FileReceivePageDto dto){
+    public RT<PageOutput<FileReceivePullPageVo>> pullPage(@Valid FileReceivePullPageDto dto) {
+        //获取用户id
+        Long userId =  StpUtil.getLoginIdAsLong();
 
-        LambdaQueryWrapper<FileReceive> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<FileReceive> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                    .orderByDesc(FileReceive::getId)
-                .select(FileReceive.class,x -> VoToColumnUtil.fieldsToColumns(FileReceivePageVo.class).contains(x.getProperty()));
-        IPage<FileReceive> page = fileReceiveService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<FileReceivePageVo> pageOutput = ConventPage.getPageOutput(page, FileReceivePageVo.class);
+                .innerJoin(WfOaPull.class, WfOaPull::getId, FileReceive::getDataId)
+                .leftJoin(XjrUser.class,XjrUser::getId,WfOaPull::getPersonName,ext -> ext.selectAs(XjrUser::getName, FileReceivePullPageVo::getUserName))
+                .eq(FileReceive::getFileType, 2)
+                .eq(FileReceive::getReceiverUserId, userId)
+                .select(WfOaPull::getId)
+                .select(WfOaPull.class, x -> VoToColumnUtil.fieldsToColumns(FileReceivePullPageVo.class).contains(x.getProperty()));
+
+        IPage<FileReceivePullPageVo> page = fileReceiveService.selectJoinListPage(ConventPage.getPage(dto),FileReceivePullPageVo.class, queryWrapper);
+        PageOutput<FileReceivePullPageVo> pageOutput = ConventPage.getPageOutput(page);
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询文件接收管理信息")
+    @GetMapping(value = "/pullinfo")
+    @ApiOperation(value = "根据id查询文件接收管理信息")
     @SaCheckPermission("filereceive:detail")
-    public RT<FileReceiveVo> info(@RequestParam Long id){
-        FileReceive fileReceive = fileReceiveService.getById(id);
+    public RT<FileReceivePullVo> pullInfo(@RequestParam Long id) {
+        MPJLambdaWrapper<WfOaPull> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .leftJoin(XjrUser.class,XjrUser::getId,WfOaPull::getPersonName,ext -> ext.selectAs(XjrUser::getName, FileReceivePullPageVo::getUserName))
+                .eq(WfOaPull::getId, id)
+                .select(WfOaPull::getId)
+                .select(WfOaPull.class, x -> VoToColumnUtil.fieldsToColumns(FileReceivePullVo.class).contains(x.getProperty()));
+
+        FileReceivePullVo fileReceive = wfOaPullService.selectJoinOne(FileReceivePullVo.class,queryWrapper);
         if (fileReceive == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(fileReceive, FileReceiveVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增文件接收管理")
-    @SaCheckPermission("filereceive:add")
-    public RT<Boolean> add(@Valid @RequestBody AddFileReceiveDto dto){
-        FileReceive fileReceive = BeanUtil.toBean(dto, FileReceive.class);
-        boolean isSuccess = fileReceiveService.save(fileReceive);
-    return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改文件接收管理")
-    @SaCheckPermission("filereceive:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateFileReceiveDto dto){
-
-        FileReceive fileReceive = BeanUtil.toBean(dto, FileReceive.class);
-        return RT.ok(fileReceiveService.updateById(fileReceive));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除文件接收管理")
-    @SaCheckPermission("filereceive:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(fileReceiveService.removeBatchByIds(ids));
-
+        // 获取文件列表
+        fileReceive.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId,fileReceive.getFiles())));
+        return RT.ok(BeanUtil.toBean(fileReceive, FileReceivePullVo.class));
     }
 
 }

src/main/java/com/xjrsoft/module/oa/dto/FileReceivePageDto.java

@@ -1,25 +0,0 @@
-package com.xjrsoft.module.oa.dto;
-
-import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
-
-/**
-* @title: 文件接收管理分页查询入参
-* @Author fanxp
-* @Date: 2023-11-03
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class FileReceivePageDto extends PageInput {
-
-
-}

src/main/java/com/xjrsoft/module/oa/dto/FileReceivePullPageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.oa.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 收文管理分页查询入参
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FileReceivePullPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/oa/mapper/FileReceiveMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface FileReceiveMapper extends BaseMapper<FileReceive> {
+public interface FileReceiveMapper extends MPJBaseMapper<FileReceive> {
 
 }

src/main/java/com/xjrsoft/module/oa/mapper/WfOaPullMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface WfOaPullMapper extends BaseMapper<WfOaPull> {
+public interface WfOaPullMapper extends MPJBaseMapper<WfOaPull> {
 
 }

src/main/java/com/xjrsoft/module/oa/mapper/WfOaPushMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface WfOaPushMapper extends BaseMapper<WfOaPush> {
+public interface WfOaPushMapper extends MPJBaseMapper<WfOaPush> {
 
 }

src/main/java/com/xjrsoft/module/oa/service/IFileReceiveService.java

@@ -13,7 +13,7 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IFileReceiveService extends IService<FileReceive> {
+public interface IFileReceiveService extends MPJBaseService<FileReceive> {
     /**
      * 收文数据缓存
      *

src/main/java/com/xjrsoft/module/oa/service/IWfOaPullService.java

@@ -13,6 +13,6 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IWfOaPullService extends IService<WfOaPull> {
+public interface IWfOaPullService extends MPJBaseService<WfOaPull> {
 
 }

src/main/java/com/xjrsoft/module/oa/service/IWfOaPushService.java

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IWfOaPushService extends IService<WfOaPush> {
+public interface IWfOaPushService extends MPJBaseService<WfOaPush> {
 }

src/main/java/com/xjrsoft/module/oa/service/impl/FileReceiveServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.oa.entity.FileReceive;
 import com.xjrsoft.module.oa.entity.WfOaPull;
+import com.xjrsoft.module.oa.entity.WfOaPush;
 import com.xjrsoft.module.oa.mapper.FileReceiveMapper;
 import com.xjrsoft.module.oa.service.IFileReceiveService;
 import com.xjrsoft.module.oa.service.IWfOaPullService;
@@ -42,7 +43,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  */
 @Service
 @AllArgsConstructor
-public class FileReceiveServiceImpl extends ServiceImpl<FileReceiveMapper, FileReceive> implements IFileReceiveService {
+public class FileReceiveServiceImpl extends MPJBaseServiceImpl<FileReceiveMapper, FileReceive> implements IFileReceiveService {
 
     private final IWfOaPullService pullService;
 
@@ -52,6 +53,7 @@ public class FileReceiveServiceImpl extends ServiceImpl<FileReceiveMapper, FileR
 
     private final BaseTeacherMapper baseTeacherMapper;
 
+    @Transactional
     @Override
     public void pullDataCache(Long id) {
         WfOaPull wfOaPull = pullService.getById(id);
@@ -61,9 +63,14 @@ public class FileReceiveServiceImpl extends ServiceImpl<FileReceiveMapper, FileR
         save(id,deptIds,2);
     }
 
+    @Transactional
     @Override
     public void pushDataCache(Long id) {
+        WfOaPush wfOaPush = pushService.getById(id);
+        String orgStr = wfOaPush.getRecipients();
+        List<Long> deptIds = Convert.toList(Long.class, orgStr.split(","));
 
+        save(id,deptIds,1);
     }
 
     /**

src/main/java/com/xjrsoft/module/oa/service/impl/WfOaPullServiceImpl.java

@@ -21,6 +21,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class WfOaPullServiceImpl extends ServiceImpl<WfOaPullMapper, WfOaPull> implements IWfOaPullService {
+public class WfOaPullServiceImpl extends MPJBaseServiceImpl<WfOaPullMapper, WfOaPull> implements IWfOaPullService {
 
 }

src/main/java/com/xjrsoft/module/oa/service/impl/WfOaPushServiceImpl.java

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class WfOaPushServiceImpl extends ServiceImpl<WfOaPushMapper, WfOaPush> implements IWfOaPushService {
+public class WfOaPushServiceImpl extends MPJBaseServiceImpl<WfOaPushMapper, WfOaPush> implements IWfOaPushService {
 }

src/main/java/com/xjrsoft/module/oa/vo/FileReceivePageVo.java

@@ -1,49 +0,0 @@
-package com.xjrsoft.module.oa.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 文件接收管理分页列表出参
-* @Author fanxp
-* @Date: 2023-11-03
-* @Version 1.0
-*/
-@Data
-public class FileReceivePageVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 接收用户编号
-    */
-    @ApiModelProperty("接收用户编号")
-    private Long receiverUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 数据编号（根据文件类型判断，数据来源->wf_oa_push,wf_oa_pull）
-    */
-    @ApiModelProperty("数据编号（根据文件类型判断，数据来源->wf_oa_push,wf_oa_pull）")
-    private Long dataId;
-    /**
-    * 文件类型 1=发文 2=收文
-    */
-    @ApiModelProperty("文件类型 1=发文 2=收文")
-    private Integer fileType;
-
-}

src/main/java/com/xjrsoft/module/oa/vo/FileReceivePullPageVo.java

@@ -0,0 +1,86 @@
+package com.xjrsoft.module.oa.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xjrsoft.module.oa.entity.WfOaPull;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+* @title: 文件接收管理分页列表出参
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Data
+public class FileReceivePullPageVo {
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+     * 来文标题
+     */
+    @ApiModelProperty("来文标题")
+    private String title;
+    /**
+     * 收文编号
+     */
+    @ApiModelProperty("收文编号")
+    private String number;
+    /**
+     * 缓急
+     */
+    @ApiModelProperty("缓急")
+    private String urgency;
+    /**
+     * 来文字号
+     */
+    @ApiModelProperty("来文字号")
+    private String pullNumber;
+    /**
+     * 来文日期
+     */
+    @ApiModelProperty("来文日期")
+    private LocalDateTime pullDate;
+    /**
+     * 来文机关
+     */
+    @ApiModelProperty("来文机关")
+    private String institution;
+    /**
+     * 密级
+     */
+    @ApiModelProperty("密级")
+    private String classification;
+    /**
+     * 拟办意见
+     */
+    @ApiModelProperty("拟办意见")
+    private String opinion;
+    /**
+     * 领导批示
+     */
+    @ApiModelProperty("领导批示")
+    private String leaderOpinion;
+    /**
+     * 部门办理情况
+     */
+    @ApiModelProperty("部门办理情况")
+    private String organHandleStatus;
+    /**
+     * 收文人
+     */
+    @ApiModelProperty("收文人")
+    private String userName;
+    /**
+     * 公文附件
+     */
+    @ApiModelProperty("公文附件")
+    private String files;
+
+}

src/main/java/com/xjrsoft/module/oa/vo/FileReceivePullVo.java

@@ -0,0 +1,92 @@
+package com.xjrsoft.module.oa.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xjrsoft.module.system.entity.File;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+* @title: 文件接收管理表单出参
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Data
+public class FileReceivePullVo {
+
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+     * 来文标题
+     */
+    @ApiModelProperty("来文标题")
+    private String title;
+    /**
+     * 收文编号
+     */
+    @ApiModelProperty("收文编号")
+    private String number;
+    /**
+     * 缓急
+     */
+    @ApiModelProperty("缓急")
+    private String urgency;
+    /**
+     * 来文字号
+     */
+    @ApiModelProperty("来文字号")
+    private String pullNumber;
+    /**
+     * 来文日期
+     */
+    @ApiModelProperty("来文日期")
+    private LocalDateTime pullDate;
+    /**
+     * 来文机关
+     */
+    @ApiModelProperty("来文机关")
+    private String institution;
+    /**
+     * 密级
+     */
+    @ApiModelProperty("密级")
+    private String classification;
+    /**
+     * 拟办意见
+     */
+    @ApiModelProperty("拟办意见")
+    private String opinion;
+    /**
+     * 领导批示
+     */
+    @ApiModelProperty("领导批示")
+    private String leaderOpinion;
+    /**
+     * 部门办理情况
+     */
+    @ApiModelProperty("部门办理情况")
+    private String organHandleStatus;
+    /**
+     * 收文人
+     */
+    @ApiModelProperty("收文人")
+    private String userName;
+    /**
+     * 公文附件
+     */
+    @ApiModelProperty("公文附件")
+    private String files;
+
+    /**
+     * 公文附件列表
+     */
+    @ApiModelProperty("公文附件列表")
+    private List<File> fileInfos;
+}

src/main/java/com/xjrsoft/module/oa/vo/FileReceiveVo.java

@@ -1,43 +0,0 @@
-package com.xjrsoft.module.oa.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
-* @title: 文件接收管理表单出参
-* @Author fanxp
-* @Date: 2023-11-03
-* @Version 1.0
-*/
-@Data
-public class FileReceiveVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 接收用户编号
-    */
-    @ApiModelProperty("接收用户编号")
-    private Long receiverUserId;
-    /**
-    * 数据编号（根据文件类型判断，数据来源->wf_oa_push,wf_oa_pull）
-    */
-    @ApiModelProperty("数据编号（根据文件类型判断，数据来源->wf_oa_push,wf_oa_pull）")
-    private Long dataId;
-    /**
-    * 文件类型 1=发文 2=收文
-    */
-    @ApiModelProperty("文件类型 1=发文 2=收文")
-    private Integer fileType;
-
-
-
-}