admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-01-16 18:51:32 +08:00
parent 689301b434
commit 7951b6d83e
4 changed files with 1395 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1361
replay_pid16872.log Normal file
View File

File diff suppressed because it is too large Load Diff

22
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java
View File

@ -68,27 +68,11 @@ public class WorkerCertificateController {
@PostMapping(value = "/add")
public Result<WorkerCertificate> add(@RequestBody WorkerCertificate workerCertificate) {
Result<WorkerCertificate> result = new Result<WorkerCertificate>();
try {
checkParam(workerCertificate);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
workerCertificate.setUploadDate(sdf.format(new Date()));
workerCertificateService.save(workerCertificate);
result.successMsg(MessageUtil.get("addSucess"));
} catch (Exception e) {
e.printStackTrace();
log.info(e.getMessage());
result.error500(MessageUtil.get("failErr"));
}
workerCertificateService.add(workerCertificate);
result.successMsg(MessageUtil.get("addSucess"));
return result;
}
private void checkParam(WorkerCertificate workerCertificate) {
if (StringUtils.isNotBlank(workerCertificate.getEffectTime()) && StringUtils.isNotBlank(workerCertificate.getIssueTime())
&& DateUtil.parse(workerCertificate.getEffectTime()).compareTo(DateUtil.parse(workerCertificate.getIssueTime())) < 0) {
throw new OpenAlertException("证书签发日期不能大于截止有效日期");
}
}
/**
* 编辑
*
@ -126,7 +110,7 @@ public class WorkerCertificateController {
if (workerCertificate == null) {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = workerCertificateService.removeById(MapUtils.getString(map, "id"));
boolean ok = workerCertificateService.delete(MapUtils.getString(map, "id"));
if (ok) {
result.successMsg(MessageUtil.get("deleteSucess"));
}

4
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerCertificateService.java
View File

@ -20,4 +20,8 @@ public interface IWorkerCertificateService extends IService<WorkerCertificate> {
Map<String, Object> selectProjectManageCertificateTotal(Map<String, Object> map);
void edit(WorkerCertificate workerCertificate);
void add(WorkerCertificate workerCertificate);
boolean delete(String id);
}

29
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java
View File

@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -67,6 +68,28 @@ public class WorkerCertificateServiceImpl extends ServiceImpl<WorkerCertificateM
checkParam(workerCertificate);
updateById(workerCertificate);
updateExpired(workerCertificate);
}
@Override
public void add(WorkerCertificate workerCertificate) {
checkParam(workerCertificate);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
workerCertificate.setUploadDate(sdf.format(new Date()));
save(workerCertificate);
updateExpired(workerCertificate);
}
@Override
public boolean delete(String id) {
WorkerCertificate workerCertificate = baseMapper.selectById(id);
baseMapper.deleteById(id);
updateExpired(workerCertificate);
return true;
}
private void updateExpired(WorkerCertificate workerCertificate) {
List<WorkerCertificate> workerCertificates = workerCertificateMapper.selectList(new LambdaQueryWrapper<WorkerCertificate>()
.eq(WorkerCertificate::getWorkerId, workerCertificate.getWorkerId()));
List<WorkerCertificate> expiredList = workerCertificates.stream().filter(c -> {
@ -75,8 +98,10 @@ public class WorkerCertificateServiceImpl extends ServiceImpl<WorkerCertificateM
if (CollUtil.isNotEmpty(expiredList)) {
WorkerInfo workerInfo = workerInfoMapper.selectById(workerCertificate.getWorkerId());
List<WorkerBlacklist> workerBlacklists = workerBlacklistMapper.selectList(new LambdaQueryWrapper<WorkerBlacklist>()
.eq(WorkerBlacklist::getWorkerId, workerInfo.getId()));
if (CollUtil.isNotEmpty(workerBlacklists)) {
.eq(WorkerBlacklist::getWorkerId, workerInfo.getId())
.eq(WorkerBlacklist::getType, 1)
);
if (CollUtil.isEmpty(workerBlacklists)) {
//没有新增就新增
WorkerBlacklist black = new WorkerBlacklist();
black.setProjectSn(workerInfo.getProjectSn());