LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

资料维护部分开发

Browse Source
This commit is contained in:
zhangqinlin
2021-09-02 15:53:34 +08:00
parent 7e488f4069
commit 8c7c743b6d
9 changed files with 190 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
+24 -1
View File
@@ -57,6 +57,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
@GetMapping(value = "/tree")
public Result<?> tree() {
QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper();
queryWrapper.eq("type",1);
List<PayDataDirectory> list = payDataDirectoryService.list(queryWrapper);
List<DirectoryToTree> collect = list.stream()
.filter(payDataDirectory -> "0".equals(payDataDirectory.getParentId()))
@@ -101,6 +102,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
public Result<?> add(@Valid @RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId());
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
for(PayDataDirectory PayDataDirectory :payDataDirectories){
if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){
@@ -136,10 +138,29 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
return Result.OK("批量删除成功!");
}
/**
* 查询所有
*
*
* @return
*/
@AutoLog(value = "资料目录管理-查询所有")
@ApiOperation(value = "资料目录管理-查询所有", notes = "资料目录管理-查询所有")
@GetMapping(value = "/findall")
public Result<?> findall() {
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
return Result.OK(payDataDirectories);
}
//递归查询子文件夹
private void getPayDataDirectories(String id) {
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id);
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
//判断有无子文件夹
if(payDataDirectories.size()>0){
@@ -161,6 +182,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
public Result<?> queryByName(@RequestParam(name="name",required=false) String name) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
queryWrapper.eq("type",1);
List<PayDataDirectory> byName = payDataDirectoryMapper.selectList(queryWrapper);
for(PayDataDirectory payDataDirectory:byName) {
list2.add(payDataDirectory);
@@ -180,6 +202,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
private void findToTree(PayDataDirectory payDataDirectory) {
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataDirectory::getId, payDataDirectory.getParentId());
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
PayDataDirectory one = payDataDirectoryService.getOne(lambdaQueryWrapper);
if (!ObjectUtils.isEmpty(one)&&!list2.contains(one)) {
list2.add(one);
@@ -216,7 +239,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
*/
@AutoLog(value = "资料目录管理-编辑")
@ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
PayDataDirectory payDataDirectory = new PayDataDirectory();
BeanUtils.copyProperties(payDataDirectoryDTO,payDataDirectory);
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+70 -57
View File
@@ -1,9 +1,11 @@
package com.jero.data.controller;
import java.util.ArrayList;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
@@ -12,7 +14,10 @@ import com.jero.data.entity.PayDataFile;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.data.entity.QueryFileList2;
import com.jero.data.mapper.PayDataFileMapper;
import com.jero.data.service.IPayDataFileService;
import com.jero.modules.oss.mapper.OSSFileMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,106 +25,114 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_data_file
/**
* @Description: 资料维护
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Api(tags="pay_data_file")
@Api(tags="资料维护")
@RestController
@RequestMapping("/payDataFile/payDataFile")
@Slf4j
public class PayDataFileController extends JeroController<PayDataFile, IPayDataFileService> {
@Autowired
private IPayDataFileService payDataFileService;
@Autowired
private PayDataFileMapper payDataFileMapper;
@Autowired
private OSSFileMapper ossFileMapper;
/**
* 分页列表查询
*
* @param payDataFile
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "pay_data_file-分页列表查询")
@ApiOperation(value="pay_data_file-分页列表查询", notes="pay_data_file-分页列表查询")
@AutoLog(value = "资料维护（资料列表）-分页列表查询")
@ApiOperation(value="资料维护（资料列表）-分页列表查询", notes="资料维护（资料列表）-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayDataFile payDataFile,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayDataFile> queryWrapper = QueryGenerator.initQueryWrapper(payDataFile, req.getParameterMap());
Page<PayDataFile> page = new Page<PayDataFile>(pageNo, pageSize);
IPage<PayDataFile> pageList = payDataFileService.page(page, queryWrapper);
public Result<?> queryPageList(
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
Page<PayDataFile> page = new Page<>(pageNo, pageSize);
IPage<QueryFileList2> pageList = payDataFileMapper.pageData(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param payDataFile
* @return
*/
@AutoLog(value = "pay_data_file-添加")
@ApiOperation(value="pay_data_file-添加", notes="pay_data_file-添加")
@AutoLog(value = "资料维护-添加")
@ApiOperation(value="资料维护-添加", notes="资料维护-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayDataFile payDataFile) {
payDataFileService.save(payDataFile);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param payDataFile
* @return
*/
@AutoLog(value = "pay_data_file-编辑")
@ApiOperation(value="pay_data_file-编辑", notes="pay_data_file-编辑")
@AutoLog(value = "资料维护-编辑")
@ApiOperation(value="资料维护-编辑", notes="资料维护-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayDataFile payDataFile) {
payDataFileService.updateById(payDataFile);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "pay_data_file-通过id删除")
@ApiOperation(value="pay_data_file-通过id删除", notes="pay_data_file-通过id删除")
@AutoLog(value = "资料维护-通过id删除")
@ApiOperation(value="资料维护-通过id删除", notes="资料维护-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payDataFileService.removeById(id);
public Result<?> delete(@RequestParam(name="id",required=true) String id,@RequestParam(name="dataId",required=true) String dataId) {
LambdaQueryWrapper<PayDataFile> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataFile::getFileId,id);
payDataFileService.remove(lambdaQueryWrapper);
ossFileMapper.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "pay_data_file-批量删除")
@ApiOperation(value="pay_data_file-批量删除", notes="pay_data_file-批量删除")
@AutoLog(value = "资料维护-批量删除")
@ApiOperation(value="资料维护-批量删除", notes="资料维护-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payDataFileService.removeByIds(Arrays.asList(ids.split(",")));
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="dataIds",required=true) String dataIds) {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
payDataFileMapper.deleteBatchIds(strings);
ArrayList<String> strings2 = new ArrayList<>(Arrays.asList(dataIds.split(",")));
ossFileMapper.deleteBatchIds(strings2);
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "pay_data_file-通过id查询")
@ApiOperation(value="pay_data_file-通过id查询", notes="pay_data_file-通过id查询")
@AutoLog(value = "资料维护-通过id查询")
@ApiOperation(value="资料维护-通过id查询", notes="资料维护-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayDataFile payDataFile = payDataFileService.getById(id);
@@ -129,27 +142,27 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
return Result.OK(payDataFile);
}
/**
* 导出excel
*
* @param request
* @param payDataFile
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayDataFile payDataFile) {
return super.exportXls(request, payDataFile, PayDataFile.class, "pay_data_file");
}
/**
* 导出excel
*
* @param request
* @param payDataFile
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayDataFile payDataFile) {
return super.exportXls(request, payDataFile, PayDataFile.class, "资料维护");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayDataFile.class);
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayDataFile.class);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayDataDirectoryDTO.java
+2 -3
View File
@@ -7,7 +7,6 @@ import javax.validation.constraints.NotBlank;
@Data
public class PayDataDirectoryDTO {
@NotBlank(message = "id不能为空")
@ApiModelProperty(value = "id")
private java.lang.String id;
@@ -25,6 +24,6 @@ public class PayDataDirectoryDTO {
@ApiModelProperty(value = "备注")
private java.lang.String remarks;
// @ApiModelProperty(value = "类型(1：分标委，2：会议)")
// private java.lang.Integer type;
@ApiModelProperty(value = "类型(1：分标委，2：会议),此接口为1")
private java.lang.Integer type;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayDataDirectory.java
+3
View File
@@ -51,6 +51,9 @@ public class PayDataDirectory implements Serializable {
@Excel(name = "类型(1：分标委，2：会议)", width = 15)
@ApiModelProperty(value = "类型(1：分标委，2：会议)")
private java.lang.Integer type;
/**创建人*/
@ApiModelProperty(value = "会议id")
private java.lang.String meetingId;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java
+33
View File
@@ -0,0 +1,33 @@
package com.jero.data.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "资料（会议）列表")
public class QueryFileList {
@ApiModelProperty(value = "资料id")
private java.lang.String id;
@ApiModelProperty(value = "资料名称")
private java.lang.String fileName;
@ApiModelProperty(value = "目录层级")
private java.lang.String filePath;
@ApiModelProperty(value = "会议名称")
private java.lang.String meetingName;
@ApiModelProperty(value = "会议时间")
private java.lang.String meetingTime;
@ApiModelProperty(value = "下载次数")
private java.lang.String downLodeTime;
@ApiModelProperty(value = "上传时间")
private java.lang.String upLodeTime;
@ApiModelProperty(value = "上传人")
private java.lang.String upLodePeople;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList2.java
+32
View File
@@ -0,0 +1,32 @@
package com.jero.data.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "资料（网盘）列表")
public class QueryFileList2 {
@ApiModelProperty(value = "主键id")
private java.lang.String id;
@ApiModelProperty(value = "资料id")
private java.lang.String dataId;
@ApiModelProperty(value = "资料名称")
private java.lang.String fileName;
@ApiModelProperty(value = "目录层级")
private java.lang.String filePath;
@ApiModelProperty(value = "下载次数")
private java.lang.String downLodeTime;
@ApiModelProperty(value = "上传时间")
private java.lang.String upLodeTime;
@ApiModelProperty(value = "上传人")
private java.lang.String upLodePeople;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayDataFileMapper.java
+8
View File
@@ -1,7 +1,13 @@
package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.data.entity.PayDataFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.data.entity.QueryFileList2;
import org.apache.ibatis.annotations.Param;
/**
* @Description: pay_data_file
@@ -11,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface PayDataFileMapper extends BaseMapper<PayDataFile> {
IPage<QueryFileList2> pageData(Page<PayDataFile> page, @Param(Constants.WRAPPER) QueryWrapper<Object> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml
+13 -2
View File
@@ -1,5 +1,16 @@
<?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="org.jeecg.modules.demo.payDataFile.mapper.PayDataFileMapper">
<mapper namespace="com.jero.data.mapper.PayDataFileMapper">
<select id="pageData" resultType="com.jero.data.entity.QueryFileList2">
SELECT pf.id as id,
pf.file_id as dataId,
pf.file_path as filePath,
of.file_name as fileName,
dt.downLodeTime,
pf.create_by as upLodePeople,
pf.create_time as upLodeTime
FROM pay_data_file pf LEFT JOIN oss_file of on(pf.file_id=of.id) LEFT JOIN (SELECT file_id,count(file_id) as downLodeTime
FROM pay_file_download_record GROUP BY file_id) dt on (pf.file_id=dt.file_id)
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayDataFileService.java
+5
View File
@@ -1,8 +1,12 @@
package com.jero.data.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.entity.PayDataFile;
import com.jero.data.entity.QueryFileList2;
/**
* @Description: pay_data_file
@@ -12,4 +16,5 @@ import com.jero.data.entity.PayDataFile;
*/
public interface IPayDataFileService extends IService<PayDataFile> {
}