Yaxin
/
fu-hsi-service
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 调整代码结构

Browse Source
topo_dev
xueqingkun 9 months ago
parent 1e4913d6b4
commit 4856066b8e
6 changed files with 25 additions and 79 deletions
Show Stats Download Patch File Download Diff File

19
src/main/java/com/supervision/police/daoService/CaseEvidenceDaoService.java
Unescape Escape View File

@ -1,19 +0,0 @@
package com.supervision.police.daoService;
import com.supervision.police.domain.CaseEvidence;
import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.police.dto.CaseEvidenceDetailDTO;
import java.util.List;
/**
* @author Administrator
* @description 针对表【case_evidence(案件证据表)】的数据库操作Service
* @createDate 2024-07-16 14:09:42
*/
public interface CaseEvidenceDaoService extends IService<CaseEvidence> {
List<CaseEvidenceDetailDTO> queryEvidenceList(String caseId);
CaseEvidenceDetailDTO queryEvidenceDetail(String evidenceId);
}

34
src/main/java/com/supervision/police/daoService/impl/CaseEvidenceServiceDaoImpl.java
Unescape Escape View File

@ -1,34 +0,0 @@
package com.supervision.police.daoService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.police.domain.CaseEvidence;
import com.supervision.police.daoService.CaseEvidenceDaoService;
import com.supervision.police.dto.CaseEvidenceDetailDTO;
import com.supervision.police.mapper.CaseEvidenceMapper;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author Administrator
* @description 针对表【case_evidence(案件证据表)】的数据库操作Service实现
* @createDate 2024-07-16 14:09:42
*/
@Service
public class CaseEvidenceServiceDaoImpl extends ServiceImpl<CaseEvidenceMapper, CaseEvidence>
implements CaseEvidenceDaoService {
@Override
public List<CaseEvidenceDetailDTO> queryEvidenceList(String caseId) {
return super.getBaseMapper().queryEvidenceList(caseId);
}
@Override
public CaseEvidenceDetailDTO queryEvidenceDetail(String evidenceId) {
return super.getBaseMapper().queryEvidenceDetail(evidenceId);
}
}

2
src/main/java/com/supervision/police/service/CaseEvidenceService.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.supervision.police.dto.CaseEvidenceDetailDTO;
import java.util.List;
public interface CaseEvidenceService /* extends IService<CaseEvidence>*/ {
public interface CaseEvidenceService extends IService<CaseEvidence> {
/**
* 保存案件证据信息

4
src/main/java/com/supervision/police/daoService/EvidenceFileDaoService.java → src/main/java/com/supervision/police/service/EvidenceFileService.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.supervision.police.daoService;
package com.supervision.police.service;
import com.supervision.police.domain.EvidenceFile;
import com.baomidou.mybatisplus.extension.service.IService;
@ -11,7 +11,7 @@ import java.util.List;
* @description 针对表【evidence_file】的数据库操作Service
* @createDate 2024-07-16 14:09:42
*/
public interface EvidenceFileDaoService extends IService<EvidenceFile> {
public interface EvidenceFileService extends IService<EvidenceFile> {
List<EvidenceFileDTO> listFileInfo(List<String> evidenceIds);
}

37
src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
Unescape Escape View File

@ -5,13 +5,14 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.supervision.police.daoService.CaseEvidenceDaoService;
import com.supervision.police.daoService.EvidenceFileDaoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.police.service.EvidenceFileService;
import com.supervision.police.domain.CaseEvidence;
import com.supervision.police.domain.ComDictionary;
import com.supervision.police.domain.EvidenceFile;
import com.supervision.police.dto.CaseEvidenceDetailDTO;
import com.supervision.police.dto.EvidenceFileDTO;
import com.supervision.police.mapper.CaseEvidenceMapper;
import com.supervision.police.service.CaseEvidenceService;
import com.supervision.police.dto.CaseEvidenceDTO;
import com.supervision.police.service.CaseStatusManageService;
@ -28,11 +29,9 @@ import java.util.stream.Collectors;
@Slf4j
@Service
@RequiredArgsConstructor
public class CaseEvidenceServiceImpl implements CaseEvidenceService {
public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, CaseEvidence> implements CaseEvidenceService {
private final CaseEvidenceDaoService caseEvidenceDaoService;
private final EvidenceFileDaoService evidenceFileDaoService;
private final EvidenceFileService evidenceFileService;
private final ComDictionaryService comDictionaryService;
@ -46,14 +45,14 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
// 保存证据信息
CaseEvidence caseEvidence = caseEvidenceDTO.toCaseEvidence();
caseEvidenceDaoService.save(caseEvidence);
super.save(caseEvidence);
//保存文件关联信息
caseEvidenceDTO.getFileIdList().forEach(fileId -> {
EvidenceFile evidenceFile = new EvidenceFile();
evidenceFile.setFileId(fileId);
evidenceFile.setEvidenceId(caseEvidence.getId());
evidenceFileDaoService.save(evidenceFile);
evidenceFileService.save(evidenceFile);
});
caseStatusManageService.whenUpdateEvidence(caseEvidence.getCaseId());
return caseEvidence.getId();
@ -73,19 +72,19 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
Assert.notEmpty(caseEvidenceDTO.getId(),"证据id不能为空");
caseEvidencePersistenceAssert(caseEvidenceDTO);
caseEvidenceDaoService.getOptById(caseEvidenceDTO.getId()).orElseThrow(() -> new IllegalArgumentException("证据信息不存在"));
super.getOptById(caseEvidenceDTO.getId()).orElseThrow(() -> new IllegalArgumentException("证据信息不存在"));
// 更新证据信息
CaseEvidence caseEvidence = caseEvidenceDTO.toCaseEvidence();
caseEvidenceDaoService.updateById(caseEvidence);
super.updateById(caseEvidence);
// 更新文件关联信息
evidenceFileDaoService.lambdaUpdate().eq(EvidenceFile::getEvidenceId,caseEvidence.getId()).remove();
evidenceFileService.lambdaUpdate().eq(EvidenceFile::getEvidenceId,caseEvidence.getId()).remove();
caseEvidenceDTO.getFileIdList().forEach(fileId -> {
EvidenceFile evidenceFile = new EvidenceFile();
evidenceFile.setFileId(fileId);
evidenceFile.setEvidenceId(caseEvidence.getId());
evidenceFileDaoService.save(evidenceFile);
evidenceFileService.save(evidenceFile);
});
caseStatusManageService.whenUpdateEvidence(caseEvidenceDTO.getCaseId());
return caseEvidenceDTO.getId();
@ -95,11 +94,11 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
@Transactional(transactionManager = "dataSourceTransactionManager",rollbackFor = Exception.class)
public boolean deleteEvidence(String evidenceId) {
CaseEvidence caseEvidence = caseEvidenceDaoService.getOptById(evidenceId).orElseThrow(() -> new IllegalArgumentException("证据信息不存在"));
boolean remove = caseEvidenceDaoService.lambdaUpdate().eq(CaseEvidence::getId, evidenceId).remove();
CaseEvidence caseEvidence = super.getOptById(evidenceId).orElseThrow(() -> new IllegalArgumentException("证据信息不存在"));
boolean remove = super.lambdaUpdate().eq(CaseEvidence::getId, evidenceId).remove();
if (remove){
evidenceFileDaoService.lambdaUpdate().eq(EvidenceFile::getEvidenceId,evidenceId).remove();
evidenceFileService.lambdaUpdate().eq(EvidenceFile::getEvidenceId,evidenceId).remove();
caseStatusManageService.whenUpdateEvidence(caseEvidence.getCaseId());
}
return remove;
@ -109,7 +108,7 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
@Transactional(transactionManager = "dataSourceTransactionManager",rollbackFor = Exception.class)
public List<CaseEvidenceDetailDTO> queryEvidenceList(String caseId) {
return caseEvidenceDaoService.queryEvidenceList(caseId);
return super.getBaseMapper().queryEvidenceList(caseId);
}
@Override
@ -117,7 +116,7 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
public IPage<CaseEvidenceDetailDTO> pageListEvidence(String caseId,String evidenceName, Integer pageNum, Integer pageSize) {
Assert.notEmpty(caseId,"案件id不能为空");
Page<CaseEvidence> caseEvidencePage = caseEvidenceDaoService.lambdaQuery().eq(CaseEvidence::getCaseId, caseId)
Page<CaseEvidence> caseEvidencePage = super.lambdaQuery().eq(CaseEvidence::getCaseId, caseId)
.like(StrUtil.isNotEmpty(evidenceName), CaseEvidence::getEvidenceName,evidenceName)
.orderBy(true, false,CaseEvidence::getUpdateTime)
.page(new Page<>(pageNum, pageSize));
@ -128,7 +127,7 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
// 查询文件信息
List<String> evidenceIds = caseEvidencePage.getRecords().stream().map(CaseEvidence::getId).distinct().toList();
List<EvidenceFileDTO> fileInfoList = evidenceFileDaoService.listFileInfo(evidenceIds);
List<EvidenceFileDTO> fileInfoList = evidenceFileService.listFileInfo(evidenceIds);
Map<String, List<EvidenceFileDTO>> evidenceFileMap = fileInfoList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId));
// 转换分页结果
@ -145,6 +144,6 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
@Override
@Transactional(transactionManager = "dataSourceTransactionManager",rollbackFor = Exception.class)
public CaseEvidenceDetailDTO queryEvidenceDetail(String evidenceId) {
return caseEvidenceDaoService.queryEvidenceDetail(evidenceId);
return super.getBaseMapper().queryEvidenceDetail(evidenceId);
}
}

8
src/main/java/com/supervision/police/daoService/impl/EvidenceFileDaoServiceImpl.java → src/main/java/com/supervision/police/service/impl/EvidenceFileServiceImpl.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.supervision.police.daoService.impl;
package com.supervision.police.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.police.domain.EvidenceFile;
import com.supervision.police.daoService.EvidenceFileDaoService;
import com.supervision.police.service.EvidenceFileService;
import com.supervision.police.dto.EvidenceFileDTO;
import com.supervision.police.mapper.EvidenceFileMapper;
import org.springframework.stereotype.Service;
@ -15,8 +15,8 @@ import java.util.List;
* @createDate 2024-07-16 14:09:42
*/
@Service
public class EvidenceFileDaoServiceImpl extends ServiceImpl<EvidenceFileMapper, EvidenceFile>
implements EvidenceFileDaoService {
public class EvidenceFileServiceImpl extends ServiceImpl<EvidenceFileMapper, EvidenceFile>
implements EvidenceFileService {
@Override
public List<EvidenceFileDTO> listFileInfo(List<String> evidenceIds) {
Write Preview
Loading…
Cancel
Save