Dlp-Gyjd/dlp-sewage-job
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
杨海航
2025-08-13 10:03:54 +08:00
parent 298a694881
commit ec741b4249
8 changed files with 366 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/digital/laboratory/platform/sewage/SewageJobApplication.java
View File

@@ -6,15 +6,17 @@ import digital.laboratory.platform.common.swagger.annotation.EnableDLPSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.scheduling.annotation.EnableScheduling;
@EnableDLPSwagger2
@EnableDLPFeignClients
@EnableDiscoveryClient
@EnableDLPResourceServer
@SpringBootApplication(scanBasePackages="digital.laboratory.platform")
@SpringBootApplication(scanBasePackages = "digital.laboratory.platform")
@EnableScheduling
public class SewageJobApplication {
public static void main(String[] args) {
SpringApplication.run(SewageJobApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(SewageJobApplication.class, args);
}
}

22
src/main/java/digital/laboratory/platform/sewage/controller/SewageJobController.java
View File

@@ -299,7 +299,7 @@ public class SewageJobController {
sewageJob.setLauncheOrgId(dlpUser.getOrgId());
sewageJob.setStatus(0); // 初始的状态是刚创建
long count = sewageJobService.count(Wrappers.<SewageJob>lambdaQuery().eq(SewageJob::getJobYear, sewageJob.getJobYear()).eq(SewageJob::getJobSeason, sewageJob.getJobSeason()));
if (count>0){
if (count > 0) {
return R.failed(sewageJob, "当前月份任务已创建，创建失败!");
}
if (sewageJobService.save(sewageJob)) {
@@ -610,7 +610,7 @@ public class SewageJobController {
}
@PostMapping("/lead/into/{year}/{month}")
@ApiOperation(value = "导入污水任务Excel",notes = "参数：sewageJobIdentificationMaterialList：传入的Excel行的对象数组，year：拼接在路径上的任务年份，month：拼接在对象上的任务月份")
@ApiOperation(value = "导入污水任务Excel", notes = "参数：sewageJobIdentificationMaterialList：传入的Excel行的对象数组，year：拼接在路径上的任务年份，month：拼接在对象上的任务月份")
public R LeadIntoJob(@RequestBody List<SewageJobIdentificationMaterial> sewageJobIdentificationMaterialList, @PathVariable(value = "year") int year, @PathVariable(value = "month") int month, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -666,4 +666,22 @@ public class SewageJobController {
}
return userOrg;
}
@GetMapping("/getPage")
@ApiOperation(value = "贵阳市局污水任务新版接口：获取污水任务列表", notes = "获取污水任务列表")
public R getPage(Page page) {
return R.ok(sewageJobService.getPage(page));
}
@PostMapping("/createJob")
@ApiOperation(value = "贵阳市局污水任务新版接口：根据年份和季度创建污水任务", notes = "根据年份和季度创建污水任务")
public R createJob(Integer year, Integer season) {
return R.ok(sewageJobService.createJob(year, season), "操作成功!");
}
@PostMapping("/removeJob")
@ApiOperation(value = "贵阳市局污水任务新版接口：删除污水任务", notes = "删除污水任务")
public R removeJob(String jobId) {
return sewageJobService.removeJob(jobId) ? R.ok("操作成功") : R.failed("操作失败");
}
}

74
src/main/java/digital/laboratory/platform/sewage/controller/SewageJobIdentificationMaterialController.java
View File

@@ -14,6 +14,7 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.core.util.TestUtils;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.common.security.util.SecurityUtils;
import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial;
import digital.laboratory.platform.sewage.entity.SewageTreatmentPlant;
import digital.laboratory.platform.sewage.entity.UpdateInfo;
@@ -30,6 +31,7 @@ import digital.laboratory.platform.sys.entity.entrustment.SampleBox;
import digital.laboratory.platform.sewage.vo.SewageJobIdentificationMaterialVO;
import digital.laboratory.platform.sewage.vo.SewageJobItemVO;
import digital.laboratory.platform.sys.feign.*;
import feign.Param;
import io.seata.spring.annotation.GlobalTransactional;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -42,7 +44,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotBlank;
import java.security.Principal;
import java.security.Security;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -57,7 +61,7 @@ import java.util.List;
@RestController
@RequestMapping("/sewage_job_identification_material")
@Api(value = "sewage_job_identification_material", tags = "113-污水任务的检材信息管理")
public class SewageJobIdentificationMaterialController {
public class SewageJobIdentificationMaterialController {
@Resource
private SewageJobIdentificationMaterialService sewageJobIdentificationMaterialService;
@@ -67,20 +71,20 @@ public class SewageJobIdentificationMaterialController {
@Resource
private SewageJobService sewageJobService;
@Resource
private SewageTreatmentPlantService sewageTreatmentPlantService;
@Resource
private RemoteDeliverService remoteDeliverService;
@Resource
private RemoteUserService remoteUserService;
@Resource
private RemoteOrgService remoteOrgService;
@Resource
private SewageJobIdentificationMaterialMapper sewageJobIdentificationMaterialMapper;
@@ -1776,7 +1780,7 @@ public class SewageJobIdentificationMaterialController {
.or()
.like("job_name", keyword))
.in(statuses != null && statuses.length != 0,"status", statuses)
.in(statuses != null && statuses.length != 0, "status", statuses)
.in("job_item_id", itemId)
.orderByAsc("im_no", "job_name"));
return R.ok(sewageJobIdentificationMaterialVOS);
@@ -1810,4 +1814,60 @@ public class SewageJobIdentificationMaterialController {
}
return userOrg;
}
@PostMapping("/createMaterial")
@ApiOperation(value = "贵阳市局污水任务新版接口：批量创建污水检材", notes = "批量创建污水检材")
public R createMaterial(@RequestBody List<SewageJobIdentificationMaterial> materials) {
DLPUser user = SecurityUtils.getUser();
sewageJobIdentificationMaterialService.createMaterial(materials, user);
return R.ok("创建成功！");
}
@PutMapping("/batchCommit")
@ApiOperation(value = "贵阳市局污水任务新版接口：批量提交污水检材", notes = "批量提交污水检材")
public R batchCommitMaterial(@RequestBody SewageJobIdentificationMaterialDTO materialDTO) {
List<SewageJobIdentificationMaterial> materialList = sewageJobIdentificationMaterialService.batchCommitMaterial(materialDTO);
return R.ok(materialList, "提交成功!");
}
@PutMapping("/batchSignFor")
@ApiOperation(value = "贵阳市局污水任务新版接口：批量签收污水检材", notes = "批量签收污水检材")
public R batchSignForMaterial(@RequestBody SewageJobIdentificationMaterialDTO materialDTO) {
List<SewageJobIdentificationMaterial> materialList = sewageJobIdentificationMaterialService.batchSignForMaterial(materialDTO);
return R.ok(materialList, "签收成功!");
}
@GetMapping("/getList")
@ApiOperation(value = "贵阳市局污水任务新版接口：获取污水任务清单的检材列表", notes = "获取污水任务清单的检材列表")
public R getList(@NotBlank(message = "任务ID不能为空！") String jobId, Integer status) {
DLPUser user = SecurityUtils.getUser();
return R.ok(sewageJobIdentificationMaterialService.getList(jobId, status, user), "查询成功!");
}
@GetMapping("/getPage")
@ApiOperation(value = "贵阳市局污水任务新版接口：获取污水任务清单的检材列表", notes = "获取污水任务清单的检材列表")
public R getPage(Page page, @NotBlank(message = "任务ID不能为空！") String jobId, Integer status) {
return R.ok(sewageJobIdentificationMaterialService.getPage(page, jobId, status), "查询成功!");
}
@PutMapping("/editById")
@ApiOperation(value = "贵阳市局污水任务新版接口：编辑污水任务清单的检材信息", notes = "编辑污水任务清单的检材信息")
public R editById(@RequestBody SewageJobIdentificationMaterial material) {
SewageJobIdentificationMaterial material1 = sewageJobIdentificationMaterialService.editById(material);
return material != null ? R.ok(material1, "修改成功!") : R.failed("修改失败!");
}
@DeleteMapping("remove")
@ApiOperation(value = "贵阳市局污水任务新版接口：根据ID删除污水检材", notes = "根据ID删除污水检材")
public R removeById(String id) {
SewageJobIdentificationMaterial material = sewageJobIdentificationMaterialService.getById(id);
if (material.getStatus() != 0) {
throw new RuntimeException("该任务已提交，不能删除");
}
return sewageJobIdentificationMaterialService.removeMaterial(id) ? R.ok("删除成功!") : R.failed("删除失败!");
}
}

16
src/main/java/digital/laboratory/platform/sewage/service/SewageJobIdentificationMaterialService.java
View File

@@ -2,7 +2,9 @@ package digital.laboratory.platform.sewage.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.sewage.dto.SewageJobIdentificationMaterialDTO;
import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial;
import digital.laboratory.platform.sewage.vo.SewageJobIdentificationMaterialVO;
@@ -49,4 +51,18 @@ public interface SewageJobIdentificationMaterialService extends IService<SewageJ
int getSewageMaterialNoSignCount(List<Integer> materialStatus);
SewageJobIdentificationMaterial getByImNo(String imNo);
List<SewageJobIdentificationMaterial> createMaterial(List<SewageJobIdentificationMaterial> materials, DLPUser user);
List<SewageJobIdentificationMaterial> batchCommitMaterial(SewageJobIdentificationMaterialDTO materialDTO/*,int userLv,DLPUser dlpUser,SysOrg userOrg*/);
List<SewageJobIdentificationMaterial> batchSignForMaterial(SewageJobIdentificationMaterialDTO materialDTO);
List<SewageJobIdentificationMaterial> getList(String jobId, Integer status,DLPUser user);
Page<SewageJobIdentificationMaterial> getPage(Page page, String jobId, Integer status);
SewageJobIdentificationMaterial editById(SewageJobIdentificationMaterial material);
boolean removeMaterial(String id);
}

6
src/main/java/digital/laboratory/platform/sewage/service/SewageJobService.java
View File

@@ -98,4 +98,10 @@ public interface SewageJobService extends IService<SewageJob> {
List<Sample> createSample(SewageJobIdentificationMaterial sewageJobIdentificationMaterial, String dlpUserId);
List<Sample> createSample(List<SewageJobIdentificationMaterial> sewageJobIdentificationMaterialList, String dlpUserId);
Page<SewageJob> getPage(Page page);
SewageJob createJob(Integer year, Integer season);
boolean removeJob(String jobId);
}

100
src/main/java/digital/laboratory/platform/sewage/service/impl/SewageJobIdentificationMaterialServiceImpl.java
View File

@@ -3,7 +3,9 @@ package digital.laboratory.platform.sewage.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.core.constant.CommonConstants;
import digital.laboratory.platform.common.feign.RemoteTemplate2htmlService;
@@ -25,6 +27,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +41,7 @@ import java.util.Map;
*/
@RequiredArgsConstructor
@Service
@SuppressWarnings("all")
public class SewageJobIdentificationMaterialServiceImpl extends ServiceImpl<SewageJobIdentificationMaterialMapper, SewageJobIdentificationMaterial> implements SewageJobIdentificationMaterialService {
@Resource
private SewageJobService sewageJobService;
@@ -45,7 +49,7 @@ public class SewageJobIdentificationMaterialServiceImpl extends ServiceImpl<Sewa
private SewageJobItemService sewageJobItemService;
@Resource
private SewageTreatmentPlantService sewageTreatmentPlantService;
@Resource
private final RemoteTemplate2htmlService remoteTemplate2htmlService;
@@ -274,6 +278,100 @@ public class SewageJobIdentificationMaterialServiceImpl extends ServiceImpl<Sewa
return list.get(0);
} else return null;
}
@Override
public List<SewageJobIdentificationMaterial> createMaterial(List<SewageJobIdentificationMaterial> materials, DLPUser user) {
String jobId = materials.get(0).getJobId();
// int year = Year.now().getValue();
// int quarter = (LocalDate.now().getMonthValue() - 1) / 3 + 1;
// SewageJob job = sewageJobService.lambdaQuery()
// .eq(SewageJob::getJobYear, year)
// .eq(SewageJob::getJobSeason, quarter)
// .eq(SewageJob::getStatus, 1)
// .one();
// if (job == null) {
// throw new RuntimeException("没有找到对应的任务");
// }
SewageJob job = sewageJobService.getById(jobId);
for (SewageJobIdentificationMaterial material : materials) {
material.setId(IdWorker.get32UUID().toUpperCase());
material.setJobId(job.getId());
material.setDeliverOrgId(user.getOrgName());
material.setStatus(0);
}
this.saveBatch(materials);
return materials;
}
@Override
public List<SewageJobIdentificationMaterial> batchCommitMaterial(SewageJobIdentificationMaterialDTO materialDTO/*,int userLv,DLPUser dlpUser,SysOrg userOrg*/) {
List<String> ids = materialDTO.getIds();
List<SewageJobIdentificationMaterial> materialList = this.list(Wrappers
.<SewageJobIdentificationMaterial>query()
.in("id", ids));
materialList.stream().forEach(item -> {
if (item.getStatus() != 1) {
throw new RuntimeException("请勾选未提交的数据进行提交操作!");
}
item.setStatus(1);
});
return this.updateBatchById(materialList) ? materialList : null;
}
@Override
public List<SewageJobIdentificationMaterial> batchSignForMaterial(SewageJobIdentificationMaterialDTO materialDTO) {
List<String> ids = materialDTO.getIds();
List<SewageJobIdentificationMaterial> materialList = this.list(Wrappers
.<SewageJobIdentificationMaterial>query()
.in("id", ids));
materialList.stream().forEach(item -> {
if (item.getStatus() == 1) {
item.setStatus(2);
item.setAcceptTime(LocalDateTime.now());
}
});
return this.updateBatchById(materialList) ? materialList : null;
}
@Override
public List<SewageJobIdentificationMaterial> getList(String jobId, Integer status, DLPUser user) {
return this.list(Wrappers
.<SewageJobIdentificationMaterial>query()
.eq("job_id", jobId)
.eq(status != null, "status", status)
.eq("deliver_org_id", user.getOrgName())
.orderByDesc("create_time"));
}
@Override
public Page<SewageJobIdentificationMaterial> getPage(Page page, String jobId, Integer status) {
return this.page(page, Wrappers
.<SewageJobIdentificationMaterial>query()
.eq("job_id", jobId)
.eq(status != null, "status", status)
.orderByDesc("create_time"));
}
@Override
public SewageJobIdentificationMaterial editById(SewageJobIdentificationMaterial material) {
return this.updateById(material) ? material : null;
}
@Override
public boolean removeMaterial(String id) {
SewageJobIdentificationMaterial material = this.getById(id);
if (material.getStatus() != 0) {
throw new RuntimeException("该任务已提交，不能删除");
}
return this.removeById(id);
}
}

88
src/main/java/digital/laboratory/platform/sewage/service/impl/SewageJobServiceImpl.java
View File

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
@@ -72,6 +73,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
@Resource
SewageJobIdentificationMaterialMapper sewageJobIdentificationMaterialMapper;
/**
* 取新的任务号
* 前缀为 WS, 加4位 年份, 加1位季度, 加 2 位序号
@@ -111,8 +113,8 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
@Override
public String getNewSampleNo(String IdentificationMaterialNo, int sampleSerialNumber) {
String pureIMNo = StrUtil.removePrefixIgnoreCase(IdentificationMaterialNo, CommonConstants.CODE_PREFIX_IDENTIFICATION_MATERIAL); // 去掉司法鉴定委托检材的前缀 JC
pureIMNo = StrUtil.removePrefixIgnoreCase(pureIMNo, CommonConstants.CODE_PREFIX_SEWAGE_IDENTIFICATION_MATERIAL); // 去掉污水任务检材的前缀 WJ
String pureIMNo = StrUtil.removePrefixIgnoreCase(IdentificationMaterialNo, CommonConstants.CODE_PREFIX_IDENTIFICATION_MATERIAL); // 去掉司法鉴定委托检材的前缀 JC
pureIMNo = StrUtil.removePrefixIgnoreCase(pureIMNo, CommonConstants.CODE_PREFIX_SEWAGE_IDENTIFICATION_MATERIAL); // 去掉污水任务检材的前缀 WJ
String prefix = CommonConstants.CODE_PREFIX_SAMPLE + pureIMNo;
String newCode = prefix + String.format("%d", sampleSerialNumber);
@@ -447,8 +449,8 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
//如果进水口=1，那么规则就是年份+月份+污水厂编号+A/B
if (sewageTreatmentPlant.getWaterInletCount() <= 1) {
String No1 = sewageJob.getJobYear() + getQuarterNumber(sewageJob.getJobSeason()) + sewageTreatmentPlant.getNumber();
// 2024-4-15 现在送检只会送检一份工作日与节假日的混合样本了
// String No2 = sewageJob.getJobYear() + getQuarterNumber(sewageJob.getJobSeason()) + sewageTreatmentPlant.getNumber() + "B";
// 2024-4-15 现在送检只会送检一份工作日与节假日的混合样本了
// String No2 = sewageJob.getJobYear() + getQuarterNumber(sewageJob.getJobSeason()) + sewageTreatmentPlant.getNumber() + "B";
SewageMaterialVo eg1 = getSewageMaterialVo(sewageTreatmentPlant, No1, "混合样本");
eg1.setMaterialType("1");
// SewageMaterialVo eg2 = getSewageMaterialVo(sewageTreatmentPlant, No2, "节假日样本");
@@ -783,6 +785,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
/**
* 查询各个状态下的检材数量
*
* @param orgId
* @return
*/
@@ -837,6 +840,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
/**
* 受理系统统计已受理的污水检材数量
*
* @return
*/
@Override
@@ -869,6 +873,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
/**
* 根据任务状态 统计不同状态下的任务数量
*
* @return
*/
@Override
@@ -901,7 +906,6 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
* 根据污水检材创建样本
*
* @param sewageJobIdentificationMaterial
*
* @return
*/
@Override
@@ -909,7 +913,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
//污水的编号重新生成，逻辑发生改变，现在一个检材就对应一个样本 8-31
List<Sample> sampleList=new ArrayList<Sample>();
List<Sample> sampleList = new ArrayList<Sample>();
List<DrugLite> candidateDrugs = JSON.parseArray(AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_SEWAGE_JOB_IDENTIFICATION_MATERIAL_CANDIDATE_DRUGS), DrugLite.class);
List<IMAdditionalProperty> additionalProperties = JSON.parseArray(AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_SEWAGE_JOB_IDENTIFICATION_MATERIAL_ADDITIONAL_PROPERTIES), IMAdditionalProperty.class);
BigDecimal quantity = new BigDecimal(Double.parseDouble(AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_SEWAGE_JOB_IDENTIFICATION_MATERIAL_QUANTITY)));
@@ -937,7 +941,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
sample1.setStorageMethod(sewageJobIdentificationMaterial.getStorageMethod());
sample1.setAcceptTime(sewageJobIdentificationMaterial.getAcceptTime());
sample1.setSampleType(sewageJobIdentificationMaterial.getSampleType().equals("1")?"A":"B");//设置类型
sample1.setSampleType(sewageJobIdentificationMaterial.getSampleType().equals("1") ? "A" : "B");//设置类型
sample1.setSewageJobId(sewageJobIdentificationMaterial.getJobId()); //设置任务ID
sample1.setHolder(dlpUserId);
sample1.setOrgId(sewageJobIdentificationMaterial.getDeliverOrgId());
@@ -952,7 +956,6 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
* 根据污水检材创建样本
*
* @param sewageJobIdentificationMaterialList
*
* @return
*/
@Override
@@ -960,7 +963,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
//污水的编号重新生成，逻辑发生改变，现在一个检材就对应一个样本 8-31
List<Sample> sampleList=new ArrayList<Sample>();
List<Sample> sampleList = new ArrayList<Sample>();
List<DrugLite> candidateDrugs = JSON.parseArray(AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_SEWAGE_JOB_IDENTIFICATION_MATERIAL_CANDIDATE_DRUGS), DrugLite.class);
List<IMAdditionalProperty> additionalProperties = JSON.parseArray(AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_SEWAGE_JOB_IDENTIFICATION_MATERIAL_ADDITIONAL_PROPERTIES), IMAdditionalProperty.class);
@@ -993,7 +996,7 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
sample1.setStorageMethod(sewageJobIdentificationMaterial.getStorageMethod());
sample1.setAcceptTime(sewageJobIdentificationMaterial.getAcceptTime());
sample1.setSampleType(sewageJobIdentificationMaterial.getSampleType().equals("1")?"A":"B");//设置类型
sample1.setSampleType(sewageJobIdentificationMaterial.getSampleType().equals("1") ? "A" : "B");//设置类型
sample1.setSewageJobId(sewageJobIdentificationMaterial.getJobId()); //设置任务ID
sample1.setHolder(dlpUserId);
sample1.setOrgId(sewageJobIdentificationMaterial.getDeliverOrgId());
@@ -1005,4 +1008,69 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
return sampleList;
}
@Override
public Page<SewageJob> getPage(Page page) {
Page paged = this.page(page, Wrappers
.<SewageJob>lambdaQuery()
.orderByDesc(SewageJob::getJobYear)
.orderByAsc(SewageJob::getJobSeason));
List<SewageJob> list = paged.getRecords();
list.forEach(job -> {
job.setComments(
sewageJobIdentificationMaterialService.lambdaQuery()
.eq(SewageJobIdentificationMaterial::getJobId, job.getId())
.eq(SewageJobIdentificationMaterial::getStatus, 1)
.count().toString());
});
return paged;
}
@Override
public SewageJob createJob(Integer year, Integer season) {
boolean exists = this.lambdaQuery()
.eq(SewageJob::getJobYear, year)
.eq(SewageJob::getJobSeason, season)
.exists();
if (exists) {
throw new RuntimeException("任务已存在");
}
SewageJob job = new SewageJob();
int month = (season - 1) * 3 + 1; // 季度对应的第一个月 (1,4,7,10)
LocalDate startDate = LocalDate.of(year, month, 1);
// 计算本季度的结束日期
LocalDate endDate = startDate.plusMonths(3).minusDays(1);
job.setJobYear(year);
job.setJobSeason(season);
job.setName(year + "年第" + season + "季度污水监测任务");
job.setJobNo(this.getNewJobNo(year, season));
job.setStatus(1);
job.setDescription("贵阳市" + year + "年第" + season + "季度污水监测任务");
job.setLauncheOrgId("0");
job.setStartDate(startDate.atStartOfDay());
job.setExpirationDate(endDate.atStartOfDay());
boolean saved = this.save(job);
if (saved) {
System.out.println(">>> 创建成功：" + "year" + "年第" + season + "季度");
return job;
} else {
System.out.println(">>> 创建失败：" + "year" + "年第" + season + "季度");
return null;
}
}
@Override
public boolean removeJob(String jobId) {
boolean exists = sewageJobIdentificationMaterialService.lambdaQuery()
.eq(SewageJobIdentificationMaterial::getJobId, jobId)
.exists();
if (exists) {
System.out.println(">>> 删除失败：" + "已有检材存在");
return false;
} else {
return this.removeById(jobId);
}
}
}

74
src/main/java/digital/laboratory/platform/sewage/task/JobTask.java Normal file
View File

@@ -0,0 +1,74 @@
package digital.laboratory.platform.sewage.task;
import digital.laboratory.platform.sewage.entity.SewageJob;
import digital.laboratory.platform.sewage.service.SewageJobService;
import lombok.extern.java.Log;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.Year;
@Log
@Component
public class JobTask {
@Resource
private SewageJobService sewageJobService;
/**
* 每天凌晨 0 点执行：判断当天所属季度任务是否存在，不存在则创建
*/
@Scheduled(cron = "0 0 0 * * ?")
public void runAtMidnight() {
log.info(">>> 每天凌晨定时任务开始执行");
int year = Year.now().getValue();
int quarter = getCurrentQuarter();
// 计算本季度的开始日期
int month = (quarter - 1) * 3 + 1; // 季度对应的第一个月 (1,4,7,10)
LocalDate startDate = LocalDate.of(year, month, 1);
// 计算本季度的结束日期
LocalDate endDate = startDate.plusMonths(3).minusDays(1);
boolean exists = sewageJobService.lambdaQuery()
.eq(SewageJob::getJobYear, year)
.eq(SewageJob::getJobSeason, quarter)
.exists();
if (exists) {
log.info(">>> 季度任务已存在：" + "year" + "年第" + quarter + "季度");
} else {
log.info(">>> 未找到季度任务，开始创建：" + "year" + "年第" + quarter + "季度");
SewageJob job = new SewageJob();
job.setJobYear(year);
job.setJobSeason(quarter);
job.setName(year + "年第" + quarter + "季度污水监测任务");
job.setJobNo(sewageJobService.getNewJobNo(year, quarter));
job.setStatus(1);
job.setDescription("贵阳市" + year + "年第" + quarter + "季度污水监测任务");
job.setLauncheOrgId("0");
job.setStartDate(startDate.atStartOfDay());
job.setExpirationDate(endDate.atStartOfDay());
boolean saved = sewageJobService.save(job);
if (saved) {
log.info(">>> 创建成功：" + "year" + "年第" + quarter + "季度");
} else {
log.info(">>> 创建失败：" + "year" + "年第" + quarter + "季度");
}
}
log.info(">>> 每天凌晨定时任务执行完毕");
}
/**
* 根据当前月份获取季度（1~4）
*/
private int getCurrentQuarter() {
int month = LocalDate.now().getMonthValue();
return (month - 1) / 3 + 1;
}
}