file

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

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.liteflow.node;
 
 import afu.org.checkerframework.checker.oigj.qual.O;
+import com.xjrsoft.module.oa.service.IFileReceiveService;
 import com.xjrsoft.module.oa.service.IWfOaPullService;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +17,16 @@ import java.util.Optional;
 @Component("wf_oa_pull_node")
 public class WfOaPullNode extends NodeComponent {
     @Autowired
-    private IWfOaPullService wfOaPullService;
+    private IFileReceiveService fileReceiveService;
+
     @Override
     public void process() throws Exception {
         // 获取表单中数据编号
         Map<String, Object> params = this.getFirstContextBean();
         Long formId = util.getFormDataId(params);
+        if (formId != null) {
+
+        }
 
         System.out.println("wf_oa_pull_node");
     }

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

@@ -0,0 +1,102 @@
+package com.xjrsoft.module.oa.controller;
+
+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.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.oa.dto.AddFileReceiveDto;
+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.service.IFileReceiveService;
+import com.xjrsoft.module.oa.vo.FileReceivePageVo;
+
+import com.xjrsoft.module.oa.vo.FileReceiveVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 文件接收管理
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/oa" + "/filereceive")
+@Api(value = "/oa"  + "/filereceive",tags = "文件接收管理代码")
+@AllArgsConstructor
+public class FileReceiveController {
+
+
+    private final IFileReceiveService fileReceiveService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="文件接收管理列表(分页)")
+    @SaCheckPermission("filereceive:detail")
+    public RT<PageOutput<FileReceivePageVo>> page(@Valid FileReceivePageDto dto){
+
+        LambdaQueryWrapper<FileReceive> queryWrapper = new LambdaQueryWrapper<>();
+        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);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询文件接收管理信息")
+    @SaCheckPermission("filereceive:detail")
+    public RT<FileReceiveVo> info(@RequestParam Long id){
+        FileReceive fileReceive = fileReceiveService.getById(id);
+        if (fileReceive == null) {
+           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));
+
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package com.xjrsoft.module.oa.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+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 AddFileReceiveDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 接收用户编号
+    */
+    @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;
+
+}

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

@@ -0,0 +1,25 @@
+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/UpdateFileReceiveDto.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.oa.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+
+
+
+/**
+* @title: 文件接收管理
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Data
+public class UpdateFileReceiveDto extends AddFileReceiveDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/oa/entity/FileReceive.java

@@ -0,0 +1,67 @@
+package com.xjrsoft.module.oa.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+* @title: 文件接收管理
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Data
+@TableName("file_receive")
+@ApiModel(value = "文件接收管理对象", description = "文件接收管理")
+@AllArgsConstructor
+@NoArgsConstructor
+public class FileReceive implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 接收用户编号
+    */
+    @ApiModelProperty("接收用户编号")
+    private Long receiverUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime 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/mapper/FileReceiveMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.oa.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.oa.entity.FileReceive;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 文件接收管理
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+@Mapper
+public interface FileReceiveMapper extends BaseMapper<FileReceive> {
+
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.oa.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.oa.entity.FileReceive;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 文件接收管理
+* @Author fanxp
+* @Date: 2023-11-03
+* @Version 1.0
+*/
+
+public interface IFileReceiveService extends IService<FileReceive> {
+    /**
+     * 收文数据缓存
+     *
+     * @param id
+     * @return
+     */
+    void pullDataCache(Long id);
+
+    /**
+     * 发文数据缓存
+     *
+     * @param id
+     * @return
+     */
+    void pushDataCache(Long id);
+}

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

@@ -14,4 +14,5 @@ import java.util.List;
 */
 
 public interface IWfOaPullService extends IService<WfOaPull> {
+
 }

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

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.oa.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+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.mapper.FileReceiveMapper;
+import com.xjrsoft.module.oa.service.IFileReceiveService;
+import com.xjrsoft.module.oa.service.IWfOaPullService;
+import com.xjrsoft.module.oa.service.IWfOaPushService;
+import com.xjrsoft.module.oa.vo.NewsAppendixVo;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
+import com.xjrsoft.module.organization.service.IUserDeptRelationService;
+import com.xjrsoft.module.organization.service.impl.UserDeptRelationServiceImpl;
+import com.xjrsoft.module.organization.vo.PostListVo;
+import com.xjrsoft.module.personnel.entity.CarManagement;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+ * @title: 文件接收管理
+ * @Author fanxp
+ * @Date: 2023-11-03
+ * @Version 1.0
+ */
+@Service
+@AllArgsConstructor
+public class FileReceiveServiceImpl extends ServiceImpl<FileReceiveMapper, FileReceive> implements IFileReceiveService {
+
+    private final IWfOaPullService pullService;
+
+    private final IWfOaPushService pushService;
+
+    private final FileReceiveMapper receiveMapper;
+
+    private final BaseTeacherMapper baseTeacherMapper;
+
+    @Override
+    public void pullDataCache(Long id) {
+        WfOaPull wfOaPull = pullService.getById(id);
+        String orgStr = wfOaPull.getPullOrgan();
+        List<Long> deptIds = Convert.toList(Long.class, orgStr.split(","));
+
+        save(id,deptIds,2);
+    }
+
+    @Override
+    public void pushDataCache(Long id) {
+
+    }
+
+    /**
+     * 保存数据
+     * @param dataId 数据编号
+     * @param deptIds 部门编号
+     * @param type 文件类型 1=发文 2=收文
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void save(Long dataId, List<Long> deptIds, Integer type) {
+        Set<Long> userIds = baseTeacherMapper.selectJoinList(BaseTeacher.class,
+                        new MPJLambdaWrapper<BaseTeacher>()
+                                .innerJoin(UserDeptRelation.class, UserDeptRelation::getUserId, BaseTeacher::getUserId)
+                                .in(UserDeptRelation::getDeptId, deptIds)
+                                .select(UserDeptRelation.class, x -> VoToColumnUtil.fieldsToColumns(UserDeptRelation.class).contains(x.getProperty())))
+                .stream().map(BaseTeacher::getUserId).collect(Collectors.toSet());
+
+        for (Long userId : userIds) {
+            FileReceive temp = new FileReceive();
+            temp.setDataId(dataId);
+            temp.setReceiverUserId(userId);
+            temp.setFileType(type);
+            receiveMapper.insert(temp);
+        }
+    }
+}

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

@@ -22,4 +22,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class WfOaPullServiceImpl extends ServiceImpl<WfOaPullMapper, WfOaPull> implements IWfOaPullService {
+
 }

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

@@ -0,0 +1,49 @@
+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/FileReceiveVo.java

@@ -0,0 +1,43 @@
+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;
+
+
+
+}

src/main/resources/apiTemplates/add.dto.java.ftl

@@ -9,6 +9,7 @@ import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Date;
 <#--子表遍历-->
 <#if childTables?? >
     <#list childTables as childTable>

src/main/resources/apiTemplates/entity.java.ftl

@@ -14,6 +14,7 @@ import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Date;
 
 
 /**

src/main/resources/apiTemplates/page.list.dto.java.ftl

@@ -9,6 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**

src/main/resources/apiTemplates/page.list.vo.java.ftl

@@ -14,6 +14,7 @@ import com.xjrsoft.common.enums.TransType;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
 * @title: ${tableComment}

src/main/resources/apiTemplates/update.dto.java.ftl

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.List;
+import java.util.Date;
 <#--子表遍历-->
 <#if childTables?? >
     <#list childTables as childTable>

src/main/resources/apiTemplates/vo.java.ftl

@@ -7,6 +7,7 @@ import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Date;
 <#--子表遍历-->
 <#if childTables?? >
     <#list childTables as childTable>

src/test/java/com/xjrsoft/xjrsoftboot/FileReceiveServiceImplTest.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.xjrsoftboot;
+
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.module.oa.service.IFileReceiveService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.sql.SQLException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
+public class FileReceiveServiceImplTest {
+
+    @Autowired
+    private IFileReceiveService fileReceiveService;
+    @Test
+    public void testPullDataCache() throws SQLException {
+        fileReceiveService.pullDataCache(1719986415095324672L);
+    }
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -294,6 +294,33 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    @Test
+    public void gcfileReceiveTest() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("file_receive");
+        mainTable.setIsMain(true);
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");
+        params.setPackageName("oa");
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);
+        params.setImport(false);
+        params.setExport(false);
+        params.setOutMainDir(true);
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);