修改默认密码

src/main/java/com/xjrsoft/module/system/controller/FileController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.UploadUtil;
@@ -20,6 +22,7 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.OSSConfig;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.oss.factory.OssFactory;
+import com.xjrsoft.module.system.dto.FileDownloadDto;
 import com.xjrsoft.module.system.dto.FileListDto;
 import com.xjrsoft.module.system.dto.FilePageDto;
 import com.xjrsoft.module.system.entity.File;
@@ -30,6 +33,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -223,4 +227,11 @@ public class FileController {
         fileService.save(fileEntity);
         return fileEntity;
     }
+
+    @GetMapping("/download")
+    @ApiOperation(value = "下载文件")
+    public ResponseEntity<byte[]> download(@Valid FileDownloadDto dto) {
+        byte[] resultBtyeAry_temp = fileService.downloadFileByZip(dto.getFolderId());
+        return RT.fileStream(resultBtyeAry_temp, "file.zip");
+    }
 }

src/main/java/com/xjrsoft/module/system/dto/FileDownloadDto.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @Author: tzx
+ * @Date: 2022/7/28 9:34
+ */
+@Data
+public class FileDownloadDto {
+    /**
+     * 文件夹id
+     */
+    private Long folderId;
+}

src/main/java/com/xjrsoft/module/system/service/IFileService.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.system.service;
 
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.system.entity.File;
+import org.springframework.http.ResponseEntity;
 
 /**
  * <p>
@@ -15,5 +16,5 @@ public interface IFileService extends MPJBaseService<File> {
 
     boolean deleteFile(String encode);
 
-    Boolean downloadFileByZip(Long folderId);
+    byte[] downloadFileByZip(Long folderId);
 }

src/main/java/com/xjrsoft/module/system/service/impl/FileServiceImpl.java

@@ -1,14 +1,23 @@
 package com.xjrsoft.module.system.service.impl;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.FileZipUtil;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.mapper.FileMapper;
 import com.xjrsoft.module.system.service.IFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.io.FileInputStream;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,30 +33,38 @@ import java.util.Map;
 @Service
 public class FileServiceImpl extends MPJBaseServiceImpl<FileMapper, File> implements IFileService {
 
+    @Autowired
+    private ResourceLoader resourceLoader;
+
     @Override
     public boolean deleteFile(String encode) {
         return false;
     }
 
     @Override
-    public Boolean downloadFileByZip(Long folderId) {
+    public byte[] downloadFileByZip(Long folderId) {
         List<File> fileList = this.list(Wrappers.<File>query().lambda().eq(File::getFolderId, folderId));
 
-        //生命一个Map，将所有文件装进去，map的key是完整的文件名
+        //声明一个Map，将所有文件装进去，map的key是完整的文件名
         Map<String, byte[]> byteAryMap = new HashMap<>();
 
-//        for (int i = 0; i < fileList.size(); i++) {
-//            java.io.File file = new java.io.File(fileList.get(i).getFileUrl());
-//            byte[] bytes = FileZipUtil.byteArray(new FileInputStream(file), true);
-//            byteAryMap.put(file.getName(), );
-//        }
+        try {
+            for (int i = 0; i < fileList.size(); i++) {
+                URL url = new URL(fileList.get(i).getFileUrl());
+                URLConnection conn = url.openConnection();
+                InputStream in = conn.getInputStream();
+
+                byte[] bytes = FileZipUtil.byteArray(in, true);
+
+                byteAryMap.put(fileList.get(i).getFileName(), bytes);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
 
         //执行下面这段代码就可以拿到压缩之后的byte数组
         byte[] resultBtyeAry_temp = FileZipUtil.byteAryMap2Zip(byteAryMap);
 
-
-        return true;
+        return resultBtyeAry_temp;
     }
-
-
 }

src/main/java/com/xjrsoft/module/workflow/dto/AddXjrWorkflowOperateRecordDto.java

@@ -0,0 +1,73 @@
+package com.xjrsoft.module.workflow.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;
+import java.util.Date;
+
+
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+public class AddXjrWorkflowOperateRecordDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 节点id
+    */
+    @ApiModelProperty("节点id")
+    private String nodeId;
+    /**
+    * 节点类型
+    */
+    @ApiModelProperty("节点类型")
+    private String nodeType;
+    /**
+    * 节点名称
+    */
+    @ApiModelProperty("节点名称")
+    private String nodeName;
+    /**
+    * 节点多实例类型（节点审批类型）
+    */
+    @ApiModelProperty("节点多实例类型（节点审批类型）")
+    private Integer nodeMultiType;
+    /**
+    * 模板id
+    */
+    @ApiModelProperty("模板id")
+    private Long schemaId;
+    /**
+    * 流程id
+    */
+    @ApiModelProperty("流程id")
+    private String processId;
+    /**
+    * 审批操作信息
+    */
+    @ApiModelProperty("审批操作信息")
+    private String operateInfo;
+    /**
+    * 记录时间
+    */
+    @ApiModelProperty("记录时间")
+    private Date recordTime;
+    /**
+    * 传阅信息
+    */
+    @ApiModelProperty("传阅信息")
+    private String circulateMessage;
+
+}

src/main/java/com/xjrsoft/module/workflow/dto/UpdateXjrWorkflowOperateRecordDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.workflow.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;
+import java.util.Date;
+
+
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+public class UpdateXjrWorkflowOperateRecordDto extends AddXjrWorkflowOperateRecordDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/workflow/dto/XjrWorkflowOperateRecordPageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.workflow.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;
+import java.util.Date;
+
+
+/**
+* @title: 工作流操作记录表分页查询入参
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrWorkflowOperateRecordPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/workflow/entity/XjrWorkflowOperateRecord.java

@@ -0,0 +1,92 @@
+package com.xjrsoft.module.workflow.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.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+@TableName("xjr_workflow_operate_record")
+@ApiModel(value = "xjr_workflow_operate_record", description = "工作流操作记录表")
+public class XjrWorkflowOperateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 节点id
+    */
+    @ApiModelProperty("节点id")
+    private String nodeId;
+    /**
+    * 节点类型
+    */
+    @ApiModelProperty("节点类型")
+    private String nodeType;
+    /**
+    * 节点名称
+    */
+    @ApiModelProperty("节点名称")
+    private String nodeName;
+    /**
+    * 节点多实例类型（节点审批类型）
+    */
+    @ApiModelProperty("节点多实例类型（节点审批类型）")
+    private Integer nodeMultiType;
+    /**
+    * 模板id
+    */
+    @ApiModelProperty("模板id")
+    private Long schemaId;
+    /**
+    * 流程id
+    */
+    @ApiModelProperty("流程id")
+    private String processId;
+    /**
+    * 审批操作信息
+    */
+    @ApiModelProperty("审批操作信息")
+    private String operateInfo;
+    /**
+    * 记录时间
+    */
+    @ApiModelProperty("记录时间")
+    private Date recordTime;
+    /**
+    * 传阅信息
+    */
+    @ApiModelProperty("传阅信息")
+    private String circulateMessage;
+    /**
+    * 操作人id
+    */
+    @ApiModelProperty("操作人id")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+
+
+}

src/main/java/com/xjrsoft/module/workflow/mapper/XjrWorkflowOperateRecordMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.workflow.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.workflow.entity.XjrWorkflowOperateRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Mapper
+public interface XjrWorkflowOperateRecordMapper extends MPJBaseMapper<XjrWorkflowOperateRecord> {
+
+}

src/main/java/com/xjrsoft/module/workflow/service/IXjrWorkflowOperateRecordService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.workflow.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.workflow.entity.XjrWorkflowOperateRecord;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+
+public interface IXjrWorkflowOperateRecordService extends MPJBaseService<XjrWorkflowOperateRecord> {
+}

src/main/java/com/xjrsoft/module/workflow/service/impl/XjrWorkflowOperateRecordServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.workflow.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.workflow.entity.XjrWorkflowOperateRecord;
+import com.xjrsoft.module.workflow.mapper.XjrWorkflowOperateRecordMapper;
+import com.xjrsoft.module.workflow.service.IXjrWorkflowOperateRecordService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 工作流操作记录表
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class XjrWorkflowOperateRecordServiceImpl extends MPJBaseServiceImpl<XjrWorkflowOperateRecordMapper, XjrWorkflowOperateRecord> implements IXjrWorkflowOperateRecordService {
+}

src/main/java/com/xjrsoft/module/workflow/vo/XjrWorkflowOperateRecordPageVo.java

@@ -0,0 +1,79 @@
+package com.xjrsoft.module.workflow.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 dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+public class XjrWorkflowOperateRecordPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 节点id
+    */
+    @ApiModelProperty("节点id")
+    private String nodeId;
+    /**
+    * 节点类型
+    */
+    @ApiModelProperty("节点类型")
+    private String nodeType;
+    /**
+    * 节点名称
+    */
+    @ApiModelProperty("节点名称")
+    private String nodeName;
+    /**
+    * 节点多实例类型（节点审批类型）
+    */
+    @ApiModelProperty("节点多实例类型（节点审批类型）")
+    private Integer nodeMultiType;
+    /**
+    * 模板id
+    */
+    @ApiModelProperty("模板id")
+    private Long schemaId;
+    /**
+    * 流程id
+    */
+    @ApiModelProperty("流程id")
+    private String processId;
+    /**
+    * 审批操作信息
+    */
+    @ApiModelProperty("审批操作信息")
+    private String operateInfo;
+    /**
+    * 记录时间
+    */
+    @ApiModelProperty("记录时间")
+    private Date recordTime;
+    /**
+    * 传阅信息
+    */
+    @ApiModelProperty("传阅信息")
+    private String circulateMessage;
+    /**
+    * 操作人id
+    */
+    @ApiModelProperty("操作人id")
+    private Long createUserId;
+
+}

src/main/java/com/xjrsoft/module/workflow/vo/XjrWorkflowOperateRecordVo.java

@@ -0,0 +1,74 @@
+package com.xjrsoft.module.workflow.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;
+import java.util.Date;
+
+/**
+* @title: 工作流操作记录表表单出参
+* @Author dzx
+* @Date: 2024-02-27
+* @Version 1.0
+*/
+@Data
+public class XjrWorkflowOperateRecordVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 节点id
+    */
+    @ApiModelProperty("节点id")
+    private String nodeId;
+    /**
+    * 节点类型
+    */
+    @ApiModelProperty("节点类型")
+    private String nodeType;
+    /**
+    * 节点名称
+    */
+    @ApiModelProperty("节点名称")
+    private String nodeName;
+    /**
+    * 节点多实例类型（节点审批类型）
+    */
+    @ApiModelProperty("节点多实例类型（节点审批类型）")
+    private Integer nodeMultiType;
+    /**
+    * 模板id
+    */
+    @ApiModelProperty("模板id")
+    private Long schemaId;
+    /**
+    * 流程id
+    */
+    @ApiModelProperty("流程id")
+    private String processId;
+    /**
+    * 审批操作信息
+    */
+    @ApiModelProperty("审批操作信息")
+    private String operateInfo;
+    /**
+    * 记录时间
+    */
+    @ApiModelProperty("记录时间")
+    private Date recordTime;
+    /**
+    * 传阅信息
+    */
+    @ApiModelProperty("传阅信息")
+    private String circulateMessage;
+
+
+
+}

src/main/resources/application-dev.yml

@@ -63,7 +63,7 @@ xjrsoft:
   common:
     druid-account: admin # druid 监控账户
     druid-password: admin # druid 监控密码
-    default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
+    default-password: "Aa123456." #默认密码（用户重置密码后为该密码）
     domain-api: http://10.150.10.139:8888/api #api域名地址
 #    domain-app: https://yxh-web.ngrok.yingcaibx.com/# #app域名地址
     #domain-app: http://172.19.17.106:5173/app/# #app域名地址

src/main/resources/application-pre.yml

@@ -58,7 +58,7 @@ xjrsoft:
   common:
     druid-account: admin # druid 监控账户
     druid-password: admin # druid 监控密码
-    default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
+    default-password: "Aa123456." #默认密码（用户重置密码后为该密码）
     domain-api: http://10.150.10.139:8888/api #api域名地址
     #    domain-app: https://yxh-web.ngrok.yingcaibx.com/# #app域名地址
     domain-app: http://172.19.17.106:5173/app/# #app域名地址

src/main/resources/application-prod.yml

@@ -56,7 +56,7 @@ xjrsoft:
   common:
     druid-account: admin # druid 监控账户
     druid-password: admin # druid 监控密码
-    default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
+    default-password: "Aa123456." #默认密码（用户重置密码后为该密码）
     domain-api: https://zhxy.cqtlzjzx.com/api #api域名地址
     domain-app: https://zhxy.cqtlzjzx.com/app/# #app域名地址
     domain-web: https://zhxy.cqtlzjzx.com #web域名地址

src/test/java/com/xjrsoft/module/system/service/impl/FileServiceImplTest.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.xjrsoft.module.system.service.IFileService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class FileServiceImplTest {
+
+    @Autowired
+    private IFileService fileService;
+
+    @Test
+    void downloadFileByZip() {
+        fileService.downloadFileByZip(1664109400501166082L);
+    }
+}

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

@@ -2254,4 +2254,34 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
 
     }
+
+    /**
+     * 评价项
+     * @throws IOException
+     */
+    @Test
+    public void gcWorkflowOperateRecord() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("xjr_workflow_operate_record");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("workflow");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+
+    }
 }