1.附件上传

tangzy

2021-07-13 065db937d74b59caaad98698dafeeba91b2f5bf6

1.附件上传

 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -147,6 +147,6 @@

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    private String deptid;

}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -23,6 +23,7 @@
        <result column="perid" property="perid"/>
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
    </resultMap>



 src/main/java/org/springblade/modules/recordk/entity/Recordk.java

@@ -146,6 +146,6 @@
    private Date officetime;
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    private String deptid;

}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -23,6 +23,7 @@
        <result column="perid" property="perid"/>
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
    </resultMap>



 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -171,10 +171,10 @@
     */
    @SneakyThrows
    @PostMapping("/put-file-attach")
    public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String creditcode,String type) {
    public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type) {
        String fileName = file.getOriginalFilename();
        BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,creditcode,type);
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
        bladeFile.setAttachId(attachId);
        return R.data(bladeFile);
    }
@@ -188,9 +188,9 @@
     */
    @SneakyThrows
    @PostMapping("/put-file-attach-by-name")
    public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String creditcode,String type) {
    public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type) {
        BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,creditcode,type);
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
        bladeFile.setAttachId(attachId);
        return R.data(bladeFile);
    }
@@ -203,7 +203,7 @@
     * @param bladeFile 对象存储文件
     * @return attachId
     */
    private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String creditcode,String type) {
    private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type) {
        String fileExtension = FileUtil.getFileExtension(fileName);
        Attach attach = new Attach();
        attach.setDomain(bladeFile.getDomain());
@@ -212,7 +212,7 @@
        attach.setOriginalName(bladeFile.getOriginalName());
        attach.setAttachSize(fileSize);
        attach.setExtension(fileExtension);
        attach.setCreditcode(creditcode);
        attach.setDeptid(deptid);
        attach.setType(type);
        attachService.save(attach);
        return attach.getId();

 src/main/java/org/springblade/modules/resource/entity/Attach.java

@@ -66,7 +66,7 @@
     */
    @ApiModelProperty(value = "附件大小")
    private Long attachSize;
    private String creditcode;
    private String deptid;
    private String type;



 src/main/java/org/springblade/modules/revoke/entity/Revoke.java

@@ -138,4 +138,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date ctime;
    private String deptid;
}

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml

@@ -22,6 +22,7 @@
        <result column="type" property="type"/>
        <result column="reason" property="reason"/>
        <result column="ctime" property="ctime"/>
        <result column="deptid" property="deptid"/>
    </resultMap>



 src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -172,5 +172,8 @@
        return R.status(deptService.removeDept(ids));
    }


    @GetMapping("/selectIn")
    public R selectIn() {
        return R.data(deptService.selectIn());
    }
}

 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -171,10 +171,10 @@

    <select id="selectIn" resultType="java.util.HashMap">
        SELECT
            id,
            dept_name
            id as deptid,
            dept_name as deptname
        FROM
            blade_dept
            blade_dept where is_deleted = 0
    </select>

    <!--统计单位类型数量-->

 src/main/java/org/springblade/modules/system/service/IDeptService.java

@@ -130,4 +130,5 @@
     * 懒加载获取部门树形结构,不包含顶级管理员公安局
     */
    List<DeptVO> securityLazyTree(String tenantId, Long parentId);
    List<String> selectIn();
}

 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -194,4 +194,9 @@
        }
        return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
    }

    @Override
    public List<String> selectIn() {
        return baseMapper.selectIn();
    }
}