update

src/main/java/digital/laboratory/platform/sewage/SewageJobApplication.java

@@ -6,12 +6,14 @@ 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")
+@EnableScheduling
 public class SewageJobApplication {
     public static void main(String[] args) {
         SpringApplication.run(SewageJobApplication.class, args);

src/main/java/digital/laboratory/platform/sewage/controller/SewageJobController.java

@@ -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("操作失败");
+    }
 }

src/main/java/digital/laboratory/platform/sewage/controller/SewageJobIdentificationMaterialController.java

@@ -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;
@@ -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("删除失败!");
+    }
 }

src/main/java/digital/laboratory/platform/sewage/service/SewageJobIdentificationMaterialService.java

@@ -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);
 }

src/main/java/digital/laboratory/platform/sewage/service/SewageJobService.java

@@ -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);
 }

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

@@ -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);
+    }
 }
 
 

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

@@ -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 位序号
@@ -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
@@ -952,7 +956,6 @@ public class SewageJobServiceImpl extends ServiceImpl<SewageJobMapper, SewageJob
      * 根据污水检材创建样本
      *
      * @param sewageJobIdentificationMaterialList
-     *
      * @return
      */
     @Override
@@ -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);
+        }
+    }
 }

src/main/java/digital/laboratory/platform/sewage/task/JobTask.java

@@ -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;
+    }
+}