Commit 9589e2d2 authored by zhuxiang's avatar zhuxiang
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 70945d51 cf7031d5
...@@ -5,7 +5,7 @@ import com.platform.model.dto.ExcelDataDTO; ...@@ -5,7 +5,7 @@ import com.platform.model.dto.ExcelDataDTO;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
import com.platform.model.vo.CaseVO; import com.platform.model.vo.CaseVO;
import com.platform.page.TableDataInfo; import com.platform.page.TableDataInfo;
import com.platform.service.CaseService; import com.platform.service.CasesService;
import com.platform.utils.DozerUtils; import com.platform.utils.DozerUtils;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -18,7 +18,7 @@ import java.util.List; ...@@ -18,7 +18,7 @@ import java.util.List;
public class CaseController extends BaseController { public class CaseController extends BaseController {
@Resource @Resource
private CaseService caseService; private CasesService caseService;
@ApiOperation(value = "分页") @ApiOperation(value = "分页")
@PostMapping("/page") @PostMapping("/page")
......
...@@ -49,4 +49,10 @@ public class UserController extends BaseController { ...@@ -49,4 +49,10 @@ public class UserController extends BaseController {
public Result relationPage(@RequestBody UserDTO userDTO) { public Result relationPage(@RequestBody UserDTO userDTO) {
return Result.data(userService.relationPage(userDTO)); return Result.data(userService.relationPage(userDTO));
} }
@ApiModelProperty(value = "删除用户")
@DeleteMapping()
public Result delete(@RequestParam(name = "userName") String userName) {
return Result.data(userService.delete(userName));
}
} }
...@@ -2,7 +2,7 @@ package com.platform.mapper; ...@@ -2,7 +2,7 @@ package com.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.model.dto.CaseDTO; import com.platform.model.dto.CaseDTO;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CasesEntity;
import com.platform.model.vo.CaseVO; import com.platform.model.vo.CaseVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface CaseMapper extends BaseMapper<CaseEntity> { public interface CaseMapper extends BaseMapper<CasesEntity> {
List<CaseVO> pageCase(CaseDTO caseDTO); List<CaseVO> pageCase(CaseDTO caseDTO);
...@@ -21,5 +21,5 @@ public interface CaseMapper extends BaseMapper<CaseEntity> { ...@@ -21,5 +21,5 @@ public interface CaseMapper extends BaseMapper<CaseEntity> {
Boolean removeBatchCase(@Param("ids") List<String> ids); Boolean removeBatchCase(@Param("ids") List<String> ids);
CaseEntity getInfoById(Integer id); CasesEntity getInfoById(Integer id);
} }
package com.platform.model.dto; package com.platform.model.dto;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CasesEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -15,7 +15,7 @@ import java.util.Date; ...@@ -15,7 +15,7 @@ import java.util.Date;
*/ */
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CaseDTO extends CaseEntity { public class CaseDTO extends CasesEntity {
@ApiModelProperty(value = "页数", example = "0") @ApiModelProperty(value = "页数", example = "0")
private Integer pageNum; private Integer pageNum;
......
...@@ -11,8 +11,8 @@ import lombok.Data; ...@@ -11,8 +11,8 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("case") @TableName("cases")
public class CaseEntity { public class CasesEntity {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
......
package com.platform.model.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author wujipeng
* @version 1.0
* @create 2025-08-03 9:52
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class AnalysisVO {
@ApiModelProperty("文件夹数")
private Integer folderCount;
@ApiModelProperty("总数")
private Integer totalCount;
@ApiModelProperty("错误数量")
private Integer errorCount;
private String folderName;
private String fileName;
@ApiModelProperty("错误原因")
private String errorReason;
@ApiModelProperty("调整方案建议")
private String adjustSuggest;
@ApiModelProperty("明细")
private List<AnalysisVO> detail;
}
package com.platform.model.vo; package com.platform.model.vo;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CasesEntity;
import lombok.*; import lombok.*;
import java.util.List; import java.util.List;
...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; ...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class CaseVO extends CaseEntity { public class CaseVO extends CasesEntity {
private String payUserName; private String payUserName;
......
...@@ -3,14 +3,14 @@ package com.platform.service; ...@@ -3,14 +3,14 @@ package com.platform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.dto.CaseDTO; import com.platform.model.dto.CaseDTO;
import com.platform.model.dto.ExcelDataDTO; import com.platform.model.dto.ExcelDataDTO;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CasesEntity;
import com.platform.model.vo.CaseVO; import com.platform.model.vo.CaseVO;
import com.platform.model.vo.ExcelDataVO; import com.platform.model.vo.ExcelDataVO;
import com.platform.model.vo.GraphVO; import com.platform.model.vo.GraphVO;
import java.util.List; import java.util.List;
public interface CaseService extends IService<CaseEntity> { public interface CasesService extends IService<CasesEntity> {
/** /**
* 分页查询 * 分页查询
......
...@@ -6,6 +6,7 @@ import com.platform.model.entity.ExcelDataEntity; ...@@ -6,6 +6,7 @@ import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.UserEntity; import com.platform.model.entity.UserEntity;
import com.platform.model.vo.EveryoneVO; import com.platform.model.vo.EveryoneVO;
import com.platform.model.vo.UserVO; import com.platform.model.vo.UserVO;
import com.sun.org.apache.xpath.internal.operations.Bool;
import java.util.List; import java.util.List;
...@@ -28,4 +29,6 @@ public interface UserService extends IService<UserEntity> { ...@@ -28,4 +29,6 @@ public interface UserService extends IService<UserEntity> {
List<ExcelDataEntity> cashFlow(UserDTO userDTO); List<ExcelDataEntity> cashFlow(UserDTO userDTO);
EveryoneVO relationPage(UserDTO userDTO); EveryoneVO relationPage(UserDTO userDTO);
Boolean delete(String userName);
} }
...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; ...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.platform.exception.BusinessException; import com.platform.exception.BusinessException;
import com.platform.model.entity.*; import com.platform.model.entity.*;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
import com.platform.model.vo.AnalysisVO;
import com.platform.model.vo.FileUploadVO; import com.platform.model.vo.FileUploadVO;
import com.platform.model.vo.TableHeaderVO; import com.platform.model.vo.TableHeaderVO;
import com.platform.service.*; import com.platform.service.*;
...@@ -50,7 +51,7 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -50,7 +51,7 @@ public class AnalysisServiceImpl implements AnalysisService {
@Resource @Resource
private UserAccountService userAccountService; private UserAccountService userAccountService;
@Resource @Resource
private CaseService caseService; private CasesService caseService;
private static final String[] EXCEL_EXTENSIONS = {".xlsx", ".xls"}; private static final String[] EXCEL_EXTENSIONS = {".xlsx", ".xls"};
...@@ -58,22 +59,48 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -58,22 +59,48 @@ public class AnalysisServiceImpl implements AnalysisService {
@Transactional @Transactional
public Result<?> canvas(MultipartFile[] files, String caseId, String folderName) { public Result<?> canvas(MultipartFile[] files, String caseId, String folderName) {
//查询模板 //查询模板
CaseEntity caseEntity = caseService.getById(caseId); // CasesEntity caseEntity = caseService.getById(caseId);
String templateId = caseEntity.getTemplateId(); // String templateId = caseEntity.getTemplateId();
if(StringUtils.isEmpty(templateId)){ // if(StringUtils.isEmpty(templateId)){
throw new BusinessException("案件未绑定模板"); // throw new BusinessException("案件未绑定模板");
} // }
ExcelTemplateEntity ExcelTemplate = excelTemplateService.getById(templateId); // ExcelTemplateEntity ExcelTemplate = excelTemplateService.getById(templateId);
String json = ExcelTemplate.getJson(); // String json = ExcelTemplate.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); // List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
if (ObjectUtils.isEmpty(ExcelTemplate)) { // if (ObjectUtils.isEmpty(ExcelTemplate)) {
return Result.fail("模板不存在"); // return Result.fail("模板不存在");
} // }
//默认模板
List<TableHeaderVO> tableHeaderList = Lists.newArrayList();
tableHeaderList.add(TableHeaderVO.builder().name("交易类型").index(0).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易主体的出入账标识").index(1).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易时间").index(2).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易金额").index(3).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易流水号").index(4).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方银行卡所属银行卡号").index(5).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的支付帐号").index(6).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户号").index(7).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户名称").index(8).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行名称").index(9).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行卡号").index(10).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方的支付帐号").index(11).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易支付设备ip").index(12).build());
tableHeaderList.add(TableHeaderVO.builder().name("mac地址").index(13).build());
tableHeaderList.add(TableHeaderVO.builder().name("银行外部渠道交易流水号").index(14).build());
tableHeaderList.add(TableHeaderVO.builder().name("支付帐号").index(15).build());
tableHeaderList.add(TableHeaderVO.builder().name("备注").index(16).build());
try { try {
if (files.length == 0) { if (files.length == 0) {
return Result.fail("上传的文件为空"); return Result.fail("上传的文件为空");
} }
List<FileUploadVO> fileUploadList = Lists.newArrayList(); List<FileUploadVO> fileUploadList = Lists.newArrayList();
//错误数量
List<AnalysisVO> detail = Lists.newArrayList();
int errorCount = 0;
int totalCount = 0;
for (MultipartFile file : files) { for (MultipartFile file : files) {
// 检查是否是Excel文件 // 检查是否是Excel文件
if (isExcelFile(file.getOriginalFilename())) { if (isExcelFile(file.getOriginalFilename())) {
...@@ -82,9 +109,27 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -82,9 +109,27 @@ public class AnalysisServiceImpl implements AnalysisService {
processSingleExcelFile(tempFile, tableHeaderList, folderName, fileUploadVO.getId(), caseId); processSingleExcelFile(tempFile, tableHeaderList, folderName, fileUploadVO.getId(), caseId);
//文件上传 //文件上传
fileUploadList.add(fileUploadVO); fileUploadList.add(fileUploadVO);
totalCount++;
}else {
errorCount++;
totalCount++;
detail.add(AnalysisVO.builder()
.folderName(folderName)
.fileName(file.getOriginalFilename())
.errorReason("文件格式错误")
.build());
} }
} }
if (errorCount == 0){
return Result.data(fileUploadList); return Result.data(fileUploadList);
}else {
return Result.data(AnalysisVO.builder()
.folderCount(1)
.totalCount(totalCount)
.errorCount(errorCount)
.detail(detail)
.build());
}
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
......
...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.mapper.CaseMapper; import com.platform.mapper.CaseMapper;
import com.platform.model.dto.CaseDTO; import com.platform.model.dto.CaseDTO;
import com.platform.model.dto.ExcelDataDTO; import com.platform.model.dto.ExcelDataDTO;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CasesEntity;
import com.platform.model.entity.ExcelDataEntity; import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.GroupDetailEntity; import com.platform.model.entity.GroupDetailEntity;
import com.platform.model.entity.UserRelationEntity; import com.platform.model.entity.UserRelationEntity;
...@@ -21,7 +21,7 @@ import java.util.*; ...@@ -21,7 +21,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> implements CaseService { public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implements CasesService {
@Resource @Resource
private NodeService nodeService; private NodeService nodeService;
...@@ -106,7 +106,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme ...@@ -106,7 +106,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
public GraphVO draw(CaseDTO caseDTO) { public GraphVO draw(CaseDTO caseDTO) {
// 初始化画布对象 // 初始化画布对象
GraphVO graph = new GraphVO(); GraphVO graph = new GraphVO();
CaseEntity caseEntity = baseMapper.getInfoById(caseDTO.getId()); CasesEntity caseEntity = baseMapper.getInfoById(caseDTO.getId());
if (caseEntity == null) { if (caseEntity == null) {
return graph; return graph;
} }
......
...@@ -201,4 +201,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -201,4 +201,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
PageHelper.clearPage(); PageHelper.clearPage();
return everyoneVO; return everyoneVO;
} }
@Override
@Transactional
public Boolean delete(String userName) {
excelDataService.remove(new LambdaQueryWrapper<ExcelDataEntity>().eq(ExcelDataEntity::getPayUserName, userName));
//删除关系
userRelationService.remove(new LambdaQueryWrapper<UserRelationEntity>().eq(UserRelationEntity::getUserName, userName));
userRelationService.remove(new LambdaQueryWrapper<UserRelationEntity>().eq(UserRelationEntity::getOtherName, userName));
return remove(new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserName, userName));
}
} }
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.platform.mapper.CaseMapper"> <mapper namespace="com.platform.mapper.CaseMapper">
<insert id="saveCase"> <insert id="saveCase">
insert into `case` (status, den_name, case_code, create_by, create_time, last_update_time) insert into cases (status, den_name, case_code, create_by, create_time, last_update_time)
values (#{status}, #{denName}, #{caseCode}, #{createBy}, #{createTime}, #{lastUpdateTime}) values (#{status}, #{denName}, #{caseCode}, #{createBy}, #{createTime}, #{lastUpdateTime})
</insert> </insert>
<update id="updateCase"> <update id="updateCase">
update `case` update cases
<set> <set>
<if test="status != null"> <if test="status != null">
status = #{status}, status = #{status},
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
where id = #{id} where id = #{id}
</update> </update>
<delete id="removeBatchCase"> <delete id="removeBatchCase">
delete from `case` where id in delete from cases where id in
<foreach item="item" collection="ids" separator="," open="(" close=")"> <foreach item="item" collection="ids" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
create_time, create_time,
last_update_time, last_update_time,
template_id template_id
from `case` from cases
<where> <where>
<if test="caseCode != null and caseCode != ''"> <if test="caseCode != null and caseCode != ''">
and case_code like concat('%', #{caseCode}, '%') and case_code like concat('%', #{caseCode}, '%')
...@@ -60,11 +60,11 @@ ...@@ -60,11 +60,11 @@
</if> </if>
</where> </where>
</select> </select>
<select id="getInfoById" resultType="com.platform.model.entity.CaseEntity"> <select id="getInfoById" resultType="com.platform.model.entity.CasesEntity">
select select
* *
from from
`case` cases
where where
id = #{id} id = #{id}
</select> </select>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
select select
id, id,
name, name,
amount, account,
time, time,
user user
from white from white
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment