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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-08-30 17:15:04 +08:00
parent 3c37edc230 6fea57ba64
commit c6e43f8faa
48 changed files with 1265 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java
+1 -1
View File
@@ -224,7 +224,7 @@ public interface CommonConstant {
public static final Integer USER_IDENTITY_2 = 2;
/** sys_user 表 username 唯一键索引 */
public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "index_user_name";
/** sys_user 表 work_no 唯一键索引 */
public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
/** sys_user 表 phone 唯一键索引 */
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java
+8 -9
View File
@@ -16,7 +16,7 @@ import java.util.List;
@Slf4j
public class ImportExcelUtil {
public static Result<?> imporReturnRes(int errorLines,int successLines,List<String> errorMessage) throws IOException {
public static Result<?> importReturnRes(int errorLines, int successLines, List<String> errorMessage) throws IOException {
if (errorLines == 0) {
return Result.OK("共" + successLines + "行数据全部导入成功！");
} else {
@@ -25,15 +25,14 @@ public class ImportExcelUtil {
result.put("totalCount", totalCount);
result.put("errorCount", errorLines);
result.put("successCount", successLines);
result.put("msg", "总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误行数：" + errorLines);
result.put("msg", "总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误次数：" + errorLines +"，错误信息：" +errorMessage);
String fileUrl = PmsUtil.saveErrorTxtByList(errorMessage, "userImportExcelErrorLog");
int lastIndex = fileUrl.lastIndexOf(File.separator);
String fileName = fileUrl.substring(lastIndex + 1);
result.put("fileUrl", "/sys/common/static/" + fileUrl);
result.put("fileName", fileName);
Result res = Result.OK(result);
res.setCode(201);
res.setMessage("文件导入成功，但有错误。");
//int lastIndex = fileUrl.lastIndexOf(File.separator);
//String fileName = fileUrl.substring(lastIndex + 1);
//result.put("fileUrl", "/sys/common/static/" + fileUrl);
//result.put("fileName", fileName);
Result<JSONObject> res = Result.OK(result);
res.setMessage("文件导入成功，但有错误。\n"+"总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误次数：" + errorLines +"，错误信息：" +errorMessage);
return res;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/controller/PayCaseCommitteeController.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/controller/PayCaseCommitteeController.java
+7 -13
View File
@@ -1,11 +1,8 @@
package com.jero.payCaseCommittee.controller;
package com.jero.dataMangement.payCaseCommittee.controller;
import java.text.SimpleDateFormat;
import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,16 +13,13 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO;
import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO;
import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.functions.DynamicContextAccessor;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeDTO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeDTO.java
+1 -3
View File
@@ -1,10 +1,8 @@
package com.jero.payCaseCommittee.entity.DTO;
package com.jero.dataMangement.payCaseCommittee.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommittee.entity.DTO;
package com.jero.dataMangement.payCaseCommittee.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/PayCaseCommittee.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/PayCaseCommittee.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommittee.entity;
package com.jero.dataMangement.payCaseCommittee.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/PayCaseCommitteeMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/PayCaseCommitteeMapper.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.jero.payCaseCommittee.mapper;
package com.jero.dataMangement.payCaseCommittee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
/**
* @Description: pay_case_committee
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml
View File
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/IPayCaseCommitteeService.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/IPayCaseCommitteeService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.payCaseCommittee.service;
package com.jero.dataMangement.payCaseCommittee.service;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.baomidou.mybatisplus.extension.service.IService;
/**
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java
+4 -4
View File
@@ -1,10 +1,10 @@
package com.jero.payCaseCommittee.service.impl;
package com.jero.dataMangement.payCaseCommittee.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.payCaseCommittee.mapper.PayCaseCommitteeMapper;
import com.jero.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.mapper.PayCaseCommitteeMapper;
import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService;
import org.springframework.stereotype.Service;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java
+4 -7
View File
@@ -1,8 +1,6 @@
package com.jero.payCaseCommitteeSubitem.controller;
package com.jero.dataMangement.payCaseCommitteeSubitem.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,14 +8,13 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java
+1 -4
View File
@@ -1,11 +1,8 @@
package com.jero.payCaseCommitteeSubitem.entity.DTO;
package com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotBlank;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommitteeSubitem.entity;
package com.jero.dataMangement.payCaseCommitteeSubitem.entity;
import java.io.Serializable;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.payCaseCommitteeSubitem.mapper;
package com.jero.dataMangement.payCaseCommitteeSubitem.mapper;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml
View File
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java
+2 -3
View File
@@ -1,9 +1,8 @@
package com.jero.payCaseCommitteeSubitem.service;
package com.jero.dataMangement.payCaseCommitteeSubitem.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
/**
* @Description: pay_case_committee_subitem
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+4 -5
View File
@@ -1,11 +1,10 @@
package com.jero.payCaseCommitteeSubitem.service.impl;
package com.jero.dataMangement.payCaseCommitteeSubitem.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import org.springframework.stereotype.Service;
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java
+155
View File
@@ -0,0 +1,155 @@
package com.jero.dataMangement.payDataDirectory.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.dataMangement.payDataDirectory.entity.PayDataDirectory;
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.dataMangement.payDataDirectory.service.IPayDataDirectoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_data_directory
* @Author: zql
* @Date: 2021-08-30
* @Version: V1.0
*/
@Api(tags="pay_data_directory")
@RestController
@RequestMapping("/payDataDirectory/payDataDirectory")
@Slf4j
public class PayDataDirectoryController extends JeroController<PayDataDirectory, IPayDataDirectoryService> {
@Autowired
private IPayDataDirectoryService payDataDirectoryService;
/**
* 分页列表查询
*
* @param payDataDirectory
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "pay_data_directory-分页列表查询")
@ApiOperation(value="pay_data_directory-分页列表查询", notes="pay_data_directory-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayDataDirectory payDataDirectory,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayDataDirectory> queryWrapper = QueryGenerator.initQueryWrapper(payDataDirectory, req.getParameterMap());
Page<PayDataDirectory> page = new Page<PayDataDirectory>(pageNo, pageSize);
IPage<PayDataDirectory> pageList = payDataDirectoryService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param payDataDirectory
* @return
*/
@AutoLog(value = "pay_data_directory-添加")
@ApiOperation(value="pay_data_directory-添加", notes="pay_data_directory-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayDataDirectory payDataDirectory) {
payDataDirectoryService.save(payDataDirectory);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param payDataDirectory
* @return
*/
@AutoLog(value = "pay_data_directory-编辑")
@ApiOperation(value="pay_data_directory-编辑", notes="pay_data_directory-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayDataDirectory payDataDirectory) {
payDataDirectoryService.updateById(payDataDirectory);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "pay_data_directory-通过id删除")
@ApiOperation(value="pay_data_directory-通过id删除", notes="pay_data_directory-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payDataDirectoryService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "pay_data_directory-批量删除")
@ApiOperation(value="pay_data_directory-批量删除", notes="pay_data_directory-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payDataDirectoryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "pay_data_directory-通过id查询")
@ApiOperation(value="pay_data_directory-通过id查询", notes="pay_data_directory-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id);
if(payDataDirectory==null) {
return Result.error("未找到对应数据");
}
return Result.OK(payDataDirectory);
}
/**
* 导出excel
*
* @param request
* @param payDataDirectory
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayDataDirectory payDataDirectory) {
return super.exportXls(request, payDataDirectory, PayDataDirectory.class, "pay_data_directory");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayDataDirectory.class);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/PayDataDirectory.java
+70
View File
@@ -0,0 +1,70 @@
package com.jero.dataMangement.payDataDirectory.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: pay_data_directory
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Data
@TableName("pay_data_directory")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pay_data_directory对象", description="pay_data_directory")
public class PayDataDirectory implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**父id*/
@Excel(name = "父id", width = 15)
@ApiModelProperty(value = "父id")
private java.lang.String parentId;
/**名称*/
@Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称")
private java.lang.String name;
/**排序号*/
@Excel(name = "排序号", width = 15)
@ApiModelProperty(value = "排序号")
private java.lang.String sort;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remarks;
/**类型(1：分标委，2：会议)*/
@Excel(name = "类型(1：分标委，2：会议)", width = 15)
@ApiModelProperty(value = "类型(1：分标委，2：会议)")
private java.lang.Integer type;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/mapper/PayDataDirectoryMapper.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payDataDirectory.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.dataMangement.payDataDirectory.entity.PayDataDirectory;
/**
* @Description: pay_data_directory
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface PayDataDirectoryMapper extends BaseMapper<PayDataDirectory> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/mapper/xml/PayDataDirectoryMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.payDataDirectory.mapper.PayDataDirectoryMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/service/IPayDataDirectoryService.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payDataDirectory.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.dataMangement.payDataDirectory.entity.PayDataDirectory;
/**
* @Description: pay_data_directory
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface IPayDataDirectoryService extends IService<PayDataDirectory> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/service/impl/PayDataDirectoryServiceImpl.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.dataMangement.payDataDirectory.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.dataMangement.payDataDirectory.entity.PayDataDirectory;
import com.jero.dataMangement.payDataDirectory.mapper.PayDataDirectoryMapper;
import com.jero.dataMangement.payDataDirectory.service.IPayDataDirectoryService;
import org.springframework.stereotype.Service;
/**
* @Description: pay_data_directory
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Service
public class PayDataDirectoryServiceImpl extends ServiceImpl<PayDataDirectoryMapper, PayDataDirectory> implements IPayDataDirectoryService {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataFile/controller/PayDataFileController.java
+155
View File
@@ -0,0 +1,155 @@
package com.jero.dataMangement.payDataFile.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.dataMangement.payDataFile.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.dataMangement.payDataFile.service.IPayDataFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_data_file
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Api(tags="pay_data_file")
@RestController
@RequestMapping("/payDataFile/payDataFile")
@Slf4j
public class PayDataFileController extends JeroController<PayDataFile, IPayDataFileService> {
@Autowired
private IPayDataFileService payDataFileService;
/**
* 分页列表查询
*
* @param payDataFile
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "pay_data_file-分页列表查询")
@ApiOperation(value="pay_data_file-分页列表查询", notes="pay_data_file-分页列表查询")
@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);
return Result.OK(pageList);
}
/**
* 添加
*
* @param payDataFile
* @return
*/
@AutoLog(value = "pay_data_file-添加")
@ApiOperation(value="pay_data_file-添加", notes="pay_data_file-添加")
@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-编辑")
@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删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payDataFileService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "pay_data_file-批量删除")
@ApiOperation(value="pay_data_file-批量删除", notes="pay_data_file-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payDataFileService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "pay_data_file-通过id查询")
@ApiOperation(value="pay_data_file-通过id查询", notes="pay_data_file-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayDataFile payDataFile = payDataFileService.getById(id);
if(payDataFile==null) {
return Result.error("未找到对应数据");
}
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 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/dataMangement/payDataFile/entity/PayDataFile.java
+62
View File
@@ -0,0 +1,62 @@
package com.jero.dataMangement.payDataFile.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: pay_data_file
* @Author: zql
* @Date: 2021-08-30
* @Version: V1.0
*/
@Data
@TableName("pay_data_file")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pay_data_file对象", description="pay_data_file")
public class PayDataFile implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**资料目录id*/
@Excel(name = "资料目录id", width = 15)
@ApiModelProperty(value = "资料目录id")
private java.lang.String dataId;
/**文件id*/
@Excel(name = "文件id", width = 15)
@ApiModelProperty(value = "文件id")
private java.lang.String fileId;
/**文件目录*/
@Excel(name = "文件目录", width = 15)
@ApiModelProperty(value = "文件目录")
private java.lang.String filePath;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataFile/mapper/PayDataFileMapper.java
+16
View File
@@ -0,0 +1,16 @@
package com.jero.dataMangement.payDataFile.mapper;
import java.util.List;
import com.jero.dataMangement.payDataFile.entity.PayDataFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: pay_data_file
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface PayDataFileMapper extends BaseMapper<PayDataFile> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataFile/mapper/xml/PayDataFileMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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>
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataFile/service/IPayDataFileService.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payDataFile.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.dataMangement.payDataFile.entity.PayDataFile;
/**
* @Description: pay_data_file
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface IPayDataFileService extends IService<PayDataFile> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataFile/service/impl/PayDataFileServiceImpl.java
+20
View File
@@ -0,0 +1,20 @@
package com.jero.dataMangement.payDataFile.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.dataMangement.payDataFile.entity.PayDataFile;
import com.jero.dataMangement.payDataFile.mapper.PayDataFileMapper;
import com.jero.dataMangement.payDataFile.service.IPayDataFileService;
import org.springframework.stereotype.Service;
/**
* @Description: pay_data_file
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Service
public class PayDataFileServiceImpl extends ServiceImpl<PayDataFileMapper, PayDataFile> implements IPayDataFileService {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/controller/PayDistributionRecordController.java
+155
View File
@@ -0,0 +1,155 @@
package com.jero.dataMangement.payDistributionRecord.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.dataMangement.payDistributionRecord.entity.PayDistributionRecord;
import com.jero.dataMangement.payDistributionRecord.service.IPayDistributionRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_distribution_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Api(tags="pay_distribution_record")
@RestController
@RequestMapping("/payDistributionRecord/payDistributionRecord")
@Slf4j
public class PayDistributionRecordController extends JeroController<PayDistributionRecord, IPayDistributionRecordService> {
@Autowired
private IPayDistributionRecordService payDistributionRecordService;
/**
* 分页列表查询
*
* @param payDistributionRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "pay_distribution_record-分页列表查询")
@ApiOperation(value="pay_distribution_record-分页列表查询", notes="pay_distribution_record-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayDistributionRecord payDistributionRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayDistributionRecord> queryWrapper = QueryGenerator.initQueryWrapper(payDistributionRecord, req.getParameterMap());
Page<PayDistributionRecord> page = new Page<PayDistributionRecord>(pageNo, pageSize);
IPage<PayDistributionRecord> pageList = payDistributionRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param payDistributionRecord
* @return
*/
@AutoLog(value = "pay_distribution_record-添加")
@ApiOperation(value="pay_distribution_record-添加", notes="pay_distribution_record-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayDistributionRecord payDistributionRecord) {
payDistributionRecordService.save(payDistributionRecord);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param payDistributionRecord
* @return
*/
@AutoLog(value = "pay_distribution_record-编辑")
@ApiOperation(value="pay_distribution_record-编辑", notes="pay_distribution_record-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayDistributionRecord payDistributionRecord) {
payDistributionRecordService.updateById(payDistributionRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "pay_distribution_record-通过id删除")
@ApiOperation(value="pay_distribution_record-通过id删除", notes="pay_distribution_record-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payDistributionRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "pay_distribution_record-批量删除")
@ApiOperation(value="pay_distribution_record-批量删除", notes="pay_distribution_record-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payDistributionRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "pay_distribution_record-通过id查询")
@ApiOperation(value="pay_distribution_record-通过id查询", notes="pay_distribution_record-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayDistributionRecord payDistributionRecord = payDistributionRecordService.getById(id);
if(payDistributionRecord==null) {
return Result.error("未找到对应数据");
}
return Result.OK(payDistributionRecord);
}
/**
* 导出excel
*
* @param request
* @param payDistributionRecord
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayDistributionRecord payDistributionRecord) {
return super.exportXls(request, payDistributionRecord, PayDistributionRecord.class, "pay_distribution_record");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayDistributionRecord.class);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/entity/PayDistributionRecord.java
+62
View File
@@ -0,0 +1,62 @@
package com.jero.dataMangement.payDistributionRecord.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: pay_distribution_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Data
@TableName("pay_distribution_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pay_distribution_record对象", description="pay_distribution_record")
public class PayDistributionRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**资料文件id*/
@Excel(name = "资料文件id", width = 15)
@ApiModelProperty(value = "资料文件id")
private java.lang.String dataFileId;
/**联系人id*/
@Excel(name = "联系人id", width = 15)
@ApiModelProperty(value = "联系人id")
private java.lang.String contactsId;
/**联系人名称*/
@Excel(name = "联系人名称", width = 15)
@ApiModelProperty(value = "联系人名称")
private java.lang.String contactsName;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/mapper/PayDistributionRecordMapper.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payDistributionRecord.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.dataMangement.payDistributionRecord.entity.PayDistributionRecord;
/**
* @Description: pay_distribution_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface PayDistributionRecordMapper extends BaseMapper<PayDistributionRecord> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/mapper/xml/PayDistributionRecordMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.payDistributionRecord.mapper.PayDistributionRecordMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/service/IPayDistributionRecordService.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payDistributionRecord.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.dataMangement.payDistributionRecord.entity.PayDistributionRecord;
/**
* @Description: pay_distribution_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface IPayDistributionRecordService extends IService<PayDistributionRecord> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDistributionRecord/service/impl/PayDistributionRecordServiceImpl.java
+20
View File
@@ -0,0 +1,20 @@
package com.jero.dataMangement.payDistributionRecord.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.dataMangement.payDistributionRecord.entity.PayDistributionRecord;
import com.jero.dataMangement.payDistributionRecord.mapper.PayDistributionRecordMapper;
import com.jero.dataMangement.payDistributionRecord.service.IPayDistributionRecordService;
import org.springframework.stereotype.Service;
/**
* @Description: pay_distribution_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Service
public class PayDistributionRecordServiceImpl extends ServiceImpl<PayDistributionRecordMapper, PayDistributionRecord> implements IPayDistributionRecordService {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/controller/PayFileDownloadRecordController.java
+155
View File
@@ -0,0 +1,155 @@
package com.jero.dataMangement.payFileDownloadRecord.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.dataMangement.payFileDownloadRecord.entity.PayFileDownloadRecord;
import com.jero.dataMangement.payFileDownloadRecord.service.IPayFileDownloadRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_file_download_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Api(tags="pay_file_download_record")
@RestController
@RequestMapping("/payFileDownloadRecord/payFileDownloadRecord")
@Slf4j
public class PayFileDownloadRecordController extends JeroController<PayFileDownloadRecord, IPayFileDownloadRecordService> {
@Autowired
private IPayFileDownloadRecordService payFileDownloadRecordService;
/**
* 分页列表查询
*
* @param payFileDownloadRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "pay_file_download_record-分页列表查询")
@ApiOperation(value="pay_file_download_record-分页列表查询", notes="pay_file_download_record-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayFileDownloadRecord payFileDownloadRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayFileDownloadRecord> queryWrapper = QueryGenerator.initQueryWrapper(payFileDownloadRecord, req.getParameterMap());
Page<PayFileDownloadRecord> page = new Page<PayFileDownloadRecord>(pageNo, pageSize);
IPage<PayFileDownloadRecord> pageList = payFileDownloadRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param payFileDownloadRecord
* @return
*/
@AutoLog(value = "pay_file_download_record-添加")
@ApiOperation(value="pay_file_download_record-添加", notes="pay_file_download_record-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
payFileDownloadRecordService.save(payFileDownloadRecord);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param payFileDownloadRecord
* @return
*/
@AutoLog(value = "pay_file_download_record-编辑")
@ApiOperation(value="pay_file_download_record-编辑", notes="pay_file_download_record-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
payFileDownloadRecordService.updateById(payFileDownloadRecord);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "pay_file_download_record-通过id删除")
@ApiOperation(value="pay_file_download_record-通过id删除", notes="pay_file_download_record-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payFileDownloadRecordService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "pay_file_download_record-批量删除")
@ApiOperation(value="pay_file_download_record-批量删除", notes="pay_file_download_record-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payFileDownloadRecordService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "pay_file_download_record-通过id查询")
@ApiOperation(value="pay_file_download_record-通过id查询", notes="pay_file_download_record-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayFileDownloadRecord payFileDownloadRecord = payFileDownloadRecordService.getById(id);
if(payFileDownloadRecord==null) {
return Result.error("未找到对应数据");
}
return Result.OK(payFileDownloadRecord);
}
/**
* 导出excel
*
* @param request
* @param payFileDownloadRecord
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayFileDownloadRecord payFileDownloadRecord) {
return super.exportXls(request, payFileDownloadRecord, PayFileDownloadRecord.class, "pay_file_download_record");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayFileDownloadRecord.class);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/entity/PayFileDownloadRecord.java
+74
View File
@@ -0,0 +1,74 @@
package com.jero.dataMangement.payFileDownloadRecord.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: pay_file_download_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Data
@TableName("pay_file_download_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pay_file_download_record对象", description="pay_file_download_record")
public class PayFileDownloadRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**文件id*/
@Excel(name = "文件id", width = 15)
@ApiModelProperty(value = "文件id")
private java.lang.String fileId;
/**文件名称*/
@Excel(name = "文件名称", width = 15)
@ApiModelProperty(value = "文件名称")
private java.lang.String fileName;
/**文件目录*/
@Excel(name = "文件目录", width = 15)
@ApiModelProperty(value = "文件目录")
private java.lang.String filePath;
/**企业名称*/
@Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
private java.lang.String companyName;
/**下载用户名称*/
@Excel(name = "下载用户名称", width = 15)
@ApiModelProperty(value = "下载用户名称")
private java.lang.String downloadName;
/**会议名称*/
@Excel(name = "会议名称", width = 15)
@ApiModelProperty(value = "会议名称")
private java.lang.String meetingName;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/mapper/PayFileDownloadRecordMapper.java
+16
View File
@@ -0,0 +1,16 @@
package com.jero.dataMangement.payFileDownloadRecord.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.dataMangement.payFileDownloadRecord.entity.PayFileDownloadRecord;
/**
* @Description: pay_file_download_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface PayFileDownloadRecordMapper extends BaseMapper<PayFileDownloadRecord> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/mapper/xml/PayFileDownloadRecordMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.payFileDownloadRecord.mapper.PayFileDownloadRecordMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/service/IPayFileDownloadRecordService.java
+15
View File
@@ -0,0 +1,15 @@
package com.jero.dataMangement.payFileDownloadRecord.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.dataMangement.payFileDownloadRecord.entity.PayFileDownloadRecord;
/**
* @Description: pay_file_download_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
public interface IPayFileDownloadRecordService extends IService<PayFileDownloadRecord> {
}
jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payFileDownloadRecord/service/impl/PayFileDownloadRecordServiceImpl.java
+20
View File
@@ -0,0 +1,20 @@
package com.jero.dataMangement.payFileDownloadRecord.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.dataMangement.payFileDownloadRecord.entity.PayFileDownloadRecord;
import com.jero.dataMangement.payFileDownloadRecord.mapper.PayFileDownloadRecordMapper;
import com.jero.dataMangement.payFileDownloadRecord.service.IPayFileDownloadRecordService;
import org.springframework.stereotype.Service;
/**
* @Description: pay_file_download_record
* @Author: jeecg-boot
* @Date: 2021-08-30
* @Version: V1.0
*/
@Service
public class PayFileDownloadRecordServiceImpl extends ServiceImpl<PayFileDownloadRecordMapper, PayFileDownloadRecord> implements IPayFileDownloadRecordService {
}
jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
+1 -4
View File
@@ -9,10 +9,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.quartz.entity.QuartzJob;
@@ -22,7 +20,6 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -259,7 +256,7 @@ public class QuartzJobController {
}
}
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage);
}
/**
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+1 -1
View File
@@ -381,7 +381,7 @@ public class SysDepartController {
Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
redisTemplate.delete(keys3);
redisTemplate.delete(keys4);
return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList);
return ImportExcelUtil.importReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList);
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+1 -4
View File
@@ -1,7 +1,6 @@
package com.jero.modules.system.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +16,6 @@ import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.DictQuery;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.SqlInjectionUtil;
@@ -37,7 +35,6 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
@@ -520,7 +517,7 @@ public class SysDictController {
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage);
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+43 -14
View File
@@ -9,12 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.system.util.UserUtil;
import com.jero.modules.system.vo.SysUserVo;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.jero.common.api.vo.Result;
@@ -116,8 +117,8 @@ public class SysUserController {
IPage<SysUserVo> pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId);
List<SysUserVo> userList = new ArrayList<>();
for (SysUserVo record : pageList.getRecords()) {
record.setEmail(PasswordUtil.decrypt(record.getEmail()));
record.setPhone(PasswordUtil.decrypt(record.getPhone()));
//处理邮箱和手机号的加密
UserUtil.decryptUser(record);
userList.add(record);
}
pageList.setRecords(userList);
@@ -158,8 +159,8 @@ public class SysUserController {
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
List<SysUser> userList = new ArrayList<>();
for (SysUser record : pageList.getRecords()) {
record.setEmail(PasswordUtil.decrypt(record.getEmail()));
record.setPhone(PasswordUtil.decrypt(record.getPhone()));
//处理邮箱和手机号的加密
UserUtil.decryptUser(record);
userList.add(record);
}
pageList.setRecords(userList);
@@ -191,8 +192,8 @@ public class SysUserController {
List<SysUser> userList = new ArrayList<>();
List<SysUser> records = pageList.getRecords();
for (SysUser record : records) {
record.setEmail(PasswordUtil.decrypt(record.getEmail()));
record.setPhone(PasswordUtil.decrypt(record.getPhone()));
//处理邮箱和手机号的加密
UserUtil.decryptUser(record);
userList.add(record);
}
pageList.setRecords(userList);
@@ -540,12 +541,21 @@ public class SysUserController {
}
//update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
List<SysUser> pageList = sysUserService.list(queryWrapper);
for (SysUser record : pageList) {
String username = record.getUsername();
String phone = record.getPhone();
if (StringUtils.isNotBlank(phone)){
record.setPhone(PasswordUtil.decrypt(phone));
}
List<String> roleIdsByUsername = sysBaseAPI.getRoleIdsByUsername(username);
List<String> departIdsByUsername = sysBaseAPI.getDepartIdsByUsername(username);
record.setRoleIds(Joiner.on(",").join(roleIdsByUsername));
record.setDepartIds(Joiner.on(",").join(departIdsByUsername));
}
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表");
mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息");
ExportParams exportParams = new ExportParams("用户列表数据", "导出信息");
exportParams.setImageBasePath(upLoadPath);
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
@@ -555,7 +565,7 @@ public class SysUserController {
/**
* 导出excel模板
*/
@RequiresPermissions("defect:download:template")
@RequiresPermissions("sys:user:import")
@ApiOperation(value="用户-导出excel模板", notes="用户-导出excel模板")
@GetMapping(value = "/exportTemplate")
public ModelAndView exportTemplate() {
@@ -594,6 +604,7 @@ public class SysUserController {
try {
List<SysUser> listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params);
for (int i = 0; i < listSysUsers.size(); i++) {
int lineNumber = i + 3;
SysUser sysUserExcel = listSysUsers.get(i);
if (StringUtils.isBlank(sysUserExcel.getPassword())) {
// 存入默认密码
@@ -603,14 +614,22 @@ public class SysUserController {
String salt = oConvertUtils.randomGen(8);
sysUserExcel.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
try {
ValidUtil.validate(sysUserExcel);
}catch (JeroBootException e) {
errorLines++;
errorMessage.add("第 " + lineNumber + " 行：" + e.getMessage());
}
sysUserExcel.setPassword(passwordEncode);
//处理邮箱和手机号的加密
UserUtil.encryptUser(sysUserExcel);
sysUserExcel.setDelFlag(0);
try {
sysUserService.save(sysUserExcel);
successLines++;
} catch (Exception e) {
errorLines++;
String message = e.getMessage().toLowerCase();
int lineNumber = i + 1;
// 通过索引名判断出错信息
if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)) {
errorMessage.add("第 " + lineNumber + " 行：用户名已经存在，忽略导入。");
@@ -625,10 +644,10 @@ public class SysUserController {
log.error(e.getMessage(), e);
}
}
String userId = sysUserExcel.getId();
// 批量将部门和用户信息建立关联关系
String departIds = sysUserExcel.getDepartIds();
if (StringUtils.isNotBlank(departIds)) {
String userId = sysUserExcel.getId();
String[] departIdArray = departIds.split(",");
List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
for (String departId : departIdArray) {
@@ -636,6 +655,16 @@ public class SysUserController {
}
sysUserDepartService.saveBatch(userDepartList);
}
//批量处理角色和用户的关联关系
String roleIds = sysUserExcel.getRoleIds();
if (StringUtils.isNotBlank(roleIds)) {
String[] roleIdArray = roleIds.split(",");
List<SysUserRole> userRoleList = new ArrayList<>();
for (String roleId : roleIdArray) {
userRoleList.add(new SysUserRole(userId,roleId));
}
sysUserRoleService.saveBatch(userRoleList);
}
}
} catch (Exception e) {
@@ -649,7 +678,7 @@ public class SysUserController {
}
}
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage);
}
/**
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+21 -26
View File
@@ -20,9 +20,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import javax.validation.constraints.*;
/**
* <p>
@@ -48,17 +46,17 @@ public class SysUser implements Serializable {
/**
* 登录账号
*/
@Excel(name = "登录账号", width = 15)
@NotBlank(message = "账号不能为空")
@Size(max = 50,message = "账号最长为50")
@Excel(name = "用户账号", width = 15)
@NotBlank(message = "用户账号不能为空")
@Size(max = 50,message = "用户账号最长为50")
private String username;
/**
* 真实姓名
*/
@Excel(name = "真实姓名", width = 15)
@NotBlank(message = "姓名不能为空")
@Size(max = 50,message = "姓名最长为50")
@Excel(name = "用户姓名", width = 15)
@NotBlank(message = "用户姓名不能为空")
@Size(max = 50,message = "用户姓名最长为50")
private String realname;
/**
@@ -77,13 +75,11 @@ public class SysUser implements Serializable {
/**
* 头像
*/
@Excel(name = "头像", width = 15,type = 2)
private String avatar;
/**
* 生日
*/
@Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@@ -91,21 +87,21 @@ public class SysUser implements Serializable {
/**
* 性别（1：男 2：女）
*/
@Excel(name = "性别", width = 15,dicCode="sex")
@Dict(dicCode = "sex")
private Integer sex;
/**
* 电子邮箱
*/
@Excel(name = "电子邮箱", width = 15)
@Email(message = "电子邮箱格式不正确")
@Email(message = "邮箱格式不正确")
private String email;
/**
* 电话
*/
@Excel(name = "电话", width = 15)
@Excel(name = "手机号", width = 15)
@NotEmpty(message = "手机号不能为空！")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
private String phone;
/**
@@ -119,27 +115,23 @@ public class SysUser implements Serializable {
/**
* 状态(1：正常 2：冻结 ）
*/
@Excel(name = "状态", width = 15,dicCode="user_status")
@Dict(dicCode = "user_status")
private Integer status;
/**
* 删除状态（0，正常，1已删除）
*/
@Excel(name = "删除状态", width = 15,dicCode="del_flag")
@TableLogic
private Integer delFlag;
/**
* 工号，唯一键
*/
@Excel(name = "工号", width = 15)
private String workNo;
/**
* 座机号
*/
@Excel(name = "座机号", width = 15)
private String telephone;
/**
@@ -150,6 +142,9 @@ public class SysUser implements Serializable {
/**
* 创建时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", orderNum = "1",format = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -171,13 +166,6 @@ public class SysUser implements Serializable {
*/
private Integer userIdentity;
/**
* 负责部门
*/
@Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private String departIds;
/**
* 角色类型
*/
@@ -185,6 +173,13 @@ public class SysUser implements Serializable {
@Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id")
private String roleIds;
/**
* 组织机构
*/
@Excel(name="组织机构",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private String departIds;
/**
* 多租户id配置，编辑用户的时候设置
*/
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
List<String> list = ImportExcelUtil.importDateSave(listSysRoles, ISysRoleService.class, errorStrs, CommonConstant.SQL_INDEX_UNIQ_SYS_ROLE_CODE);
errorLines+=list.size();
successLines+=(listSysRoles.size()-errorLines);
return ImportExcelUtil.imporReturnRes(errorLines,successLines,list);
return ImportExcelUtil.importReturnRes(errorLines,successLines,list);
}
@Override
jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java
+47
View File
@@ -0,0 +1,47 @@
package com.jero.modules.system.util;
import com.jero.common.util.PasswordUtil;
import com.jero.modules.system.entity.SysUser;
import org.apache.commons.lang.StringUtils;
/**
* @author liJiaRao
* @date 2021-08-30 16:42
*/
public class UserUtil {
/**
* 解密密文SysUser手机号邮箱
*
* @param record
* SysUser
*/
public static void decryptUser(SysUser record) {
//处理邮箱和手机号的加密
String email = record.getEmail();
if (StringUtils.isNotBlank(email)){
record.setEmail(PasswordUtil.decrypt(email));
}
String phone = record.getPhone();
if (StringUtils.isNotBlank(phone)){
record.setPhone(PasswordUtil.decrypt(phone));
}
}
/**
* 加密密文SysUser手机号邮箱
*
* @param record
* SysUser
*/
public static void encryptUser(SysUser record) {
//处理邮箱和手机号的加密
String email = record.getEmail();
if (StringUtils.isNotBlank(email)){
record.setEmail(PasswordUtil.encrypt(email));
}
String phone = record.getPhone();
if (StringUtils.isNotBlank(phone)){
record.setPhone(PasswordUtil.encrypt(phone));
}
}
}