基础包升级K7.2.0，ac-project升级K7.2.0

jfcloud-gene-biz/pom.xml

@@ -57,12 +57,6 @@
       <version>4.1.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.github.jfcloud</groupId>
-      <artifactId>jfcloud-ac-common</artifactId>
-      <version>K7.0.0</version>
-    </dependency>
-
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-aew-rich-text</artifactId>
@@ -78,6 +72,12 @@
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-ac-project-api</artifactId>
+      <version>K7.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
     </dependency>
   </dependencies>
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/GeneApplication.java

@@ -17,13 +17,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @SpringBootApplication
 @EnableTransactionManagement
-@MapperScan({"com.github.jfcloud.gene.*.mapper", "com.github.jfcloud.common.exception.mapper"})
-@ComponentScans(value = {
-        @ComponentScan(value = "com.github.jfcloud.common.aspect"),
-        @ComponentScan(value = "com.github.jfcloud.rich"),
-        @ComponentScan(value = "com.github.jfcloud.web"),
-        @ComponentScan(value = "com.github.jfcloud.common.exception"),
-        @ComponentScan(value = "com.github.jfcloud.common.exception.service.impl")
+@MapperScan({"com.github.jfcloud.gene.*.mapper", "com.github.jfcloud.web.aop.mapper"})
+@ComponentScans(value = {@ComponentScan(value = "com.github.jfcloud.rich"),
 })
 public class GeneApplication {
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/config/ExHandler.java

@@ -1,28 +0,0 @@
-package com.github.jfcloud.gene.config;
-
-import com.github.jfcloud.common.core.util.R;
-import com.github.jfcloud.common.exception.GlobalExceptionHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.exceptions.PersistenceException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 异常捕获
- * @see com.github.jfcloud.common.exception.GlobalExceptionHandler
- */
-@Slf4j
-@ControllerAdvice
-public class ExHandler extends GlobalExceptionHandler {
-
-    @ResponseBody
-    @ExceptionHandler({PersistenceException.class})
-    public R persistenceException(Exception e) {
-        log.error(e.getMessage(), e);
-        if (e.getMessage().contains("Data too long for column")) {
-            return R.failed(errorJson(e), "数据长度超出数据库字段长度限制");
-        }
-        return R.failed(errorJson(e), e.getMessage());
-    }
-}

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/dict/service/impl/DictServiceImpl.java

@@ -3,7 +3,7 @@ package com.github.jfcloud.gene.dict.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.dict.entity.DictCommon;
 import com.github.jfcloud.gene.dict.mapper.DictMapper;
 import com.github.jfcloud.gene.dict.service.DictService;
@@ -21,7 +21,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, DictCommon> impleme
     public List<DictVo> getByGroup(String group) {
         List<DictCommon> dictCommons = list(new LambdaQueryWrapper<>(DictCommon.class)
                 .eq(DictCommon::getDictGroup, group)
-                .eq(DictCommon::getDeleted, WhetherEnum.NO.getCode())
+                .eq(DictCommon::getDeleted, YesNoEnum.NO.getCode())
                 .orderByAsc(DictCommon::getDictSort, DictCommon::getId));
         return BeanUtil.copyToList(dictCommons, DictVo.class);
     }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/file/service/impl/FileInfoServiceImpl.java

@@ -12,10 +12,9 @@ import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.file.core.FileProperties;
 import com.github.jfcloud.common.file.core.FileTemplate;
-import com.github.jfcloud.common.holder.RequestHolder;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.file.entity.FileInfo;
 import com.github.jfcloud.gene.file.mapper.FileInfoMapper;
 import com.github.jfcloud.gene.file.service.FileInfoService;
@@ -23,6 +22,7 @@ import com.github.jfcloud.gene.file.vo.FileDetail;
 import com.github.jfcloud.gene.file.vo.FileVo;
 import com.github.jfcloud.gene.flow.entity.FlowFileVersion;
 import com.github.jfcloud.gene.util.WordUtil;
+import com.github.jfcloud.web.controller.JfcloudRestController;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.docx4j.Docx4J;
@@ -47,7 +47,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     public List<FileVo> listByRelateId(Long relateId) {
         List<FileInfo> list = list(new LambdaQueryWrapper<>(FileInfo.class)
                 .eq(FileInfo::getRelateId, relateId)
-                .eq(FileInfo::getDeleted, WhetherEnum.NO.getCode())
+                .eq(FileInfo::getDeleted, YesNoEnum.NO.getCode())
                 .orderByAsc(FileInfo::getId));
         return BeanUtil.copyToList(list, FileVo.class);
     }
@@ -82,7 +82,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
             try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArray)) {
                 FileVo fileVo = uploadFileWithFileName(byteArrayInputStream, fileName);
 
-                HttpServletRequest request = RequestHolder.getRequest();
+                HttpServletRequest request = JfcloudRestController.request();
                 String uri = request.getMethod() + " " + request.getRequestURI();
 
                 new FlowFileVersion()

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/controller/FlowController.java

@@ -6,10 +6,9 @@ import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jfcloud.common.annotation.WebApiLog;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.file.vo.FileDetail;
 import com.github.jfcloud.gene.flow.dto.FlowAuditDto;
@@ -62,7 +61,6 @@ public class FlowController {
         return R.ok(GeneStatusEnum.getGeneStatusList());
     }
 
-    @WebApiLog
     @Operation(summary = "新增")
     @PostMapping
     public R save(@Valid @RequestBody FlowDetailVo vo) {
@@ -70,7 +68,6 @@ public class FlowController {
         return R.ok();
     }
 
-    @WebApiLog
     @Operation(summary = "编辑")
     @PostMapping("/edit/{id}")
     public R update(@PathVariable Long id, @Valid @RequestBody FlowDetailVo vo) {
@@ -99,7 +96,6 @@ public class FlowController {
         return R.ok();
     }
 
-    @WebApiLog
     @Operation(summary = "审核")
     @PostMapping("/audit/{id}")
     public R audit(@PathVariable Long id, @Valid @RequestBody FlowAuditVo vo) {
@@ -151,7 +147,7 @@ public class FlowController {
                 .select(FlowInfo::getId)
                 .eq(id != null, FlowInfo::getId, id)
                 .eq(kyId != null, FlowInfo::getKyId, kyId)
-                .eq(FlowInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(FlowInfo::getDeleted, YesNoEnum.NO.getCode()));
         if (flowInfo == null) {
             return R.failed("找不到对应的流程");
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/controller/GeneApiController.java

@@ -3,8 +3,8 @@ package com.github.jfcloud.gene.flow.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
-import com.github.jfcloud.common.enums.WhetherEnum;
 import com.github.jfcloud.gene.flow.entity.FlowInfo;
 import com.github.jfcloud.gene.flow.service.FlowInfoService;
 import com.github.jfcloud.gene.form.dto.StrainCustomDto;
@@ -46,7 +46,7 @@ public class GeneApiController {
         List<FlowInfo> list = flowInfoService.list(new LambdaQueryWrapper<>(FlowInfo.class)
                 .select(FlowInfo::getId, FlowInfo::getApprovalNo)
                 .in(FlowInfo::getApprovalNo, projectRequestVO.getProjectNoList())
-                .eq(FlowInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(FlowInfo::getDeleted, YesNoEnum.NO.getCode()));
         Map<String, Long> projectIdMap = list.stream().collect(Collectors.toMap(FlowInfo::getApprovalNo, FlowInfo::getId, (a, b) -> b));
 
         Map<String, List<AnimalItemVo>> resultMap = new HashMap<>();

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowAuditServiceImpl.java

@@ -3,8 +3,8 @@ package com.github.jfcloud.gene.flow.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.common.constant.StrConstant;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.flow.entity.FlowAudit;
 import com.github.jfcloud.gene.flow.mapper.FlowAuditMapper;
 import com.github.jfcloud.gene.flow.service.FlowAuditService;
@@ -24,7 +24,7 @@ public class FlowAuditServiceImpl extends ServiceImpl<FlowAuditMapper, FlowAudit
         LambdaQueryWrapper<FlowAudit> wrapper = new LambdaQueryWrapper<>(FlowAudit.class)
                 .eq(FlowAudit::getFlowId, flowId)
                 .eq(StrUtil.isNotBlank(flowType), FlowAudit::getFlowType, flowType)
-                .eq(FlowAudit::getDeleted, WhetherEnum.NO.getCode());
+                .eq(FlowAudit::getDeleted, YesNoEnum.NO.getCode());
         if (!afterReject) {
             //返回所有流程信息，按时间正序返回
             return list(wrapper.orderByAsc(FlowAudit::getId));

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.common.data.datascope.DataScope;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.common.util.UserUtil;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
@@ -93,7 +93,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
                 .eq(Objects.nonNull(vo.getProjectLeaderId()), FlowInfo::getProjectLeaderId, vo.getProjectLeaderId())
                 .eq(Objects.nonNull(vo.getCreateBy()), FlowInfo::getCreateBy, vo.getCreateBy())
                 .in(!vo.getStatusList().isEmpty(), FlowInfo::getStatus, vo.getStatusList())
-                .eq(FlowInfo::getDeleted, WhetherEnum.NO.getCode())
+                .eq(FlowInfo::getDeleted, YesNoEnum.NO.getCode())
                 .orderByDesc(FlowInfo::getCreateTime);
         Page<FlowInfo> page = baseMapper.selectPageByScope(pageQuery, lqw, DataScope.of());
         if (page.getTotal() < 1) {
@@ -273,7 +273,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
             //检查批准编号的唯一性
             long count = count(new LambdaQueryWrapper<>(FlowInfo.class)
                     .eq(FlowInfo::getApprovalNo, vo.getApprovalNo())
-                    .eq(FlowInfo::getDeleted, WhetherEnum.NO.getCode()));
+                    .eq(FlowInfo::getDeleted, YesNoEnum.NO.getCode()));
             Assert.isTrue(count < 1, "项目批准编号已存在");
         }
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/NotifyServiceImpl.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
 import com.github.jfcloud.admin.api.sys.dto.message.TextMessageParam;
 import com.github.jfcloud.admin.api.sys.feign.RemoteNoticeService;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.flow.entity.FlowAudit;
 import com.github.jfcloud.gene.flow.entity.FlowInfo;
@@ -48,7 +48,7 @@ public class NotifyServiceImpl implements NotifyService {
         //查询流程前一个状态
         FlowAudit previousAudit = flowAuditMapper.selectOne(new LambdaQueryWrapper<>(FlowAudit.class)
                 .eq(FlowAudit::getFlowId, flowId)
-                .eq(FlowAudit::getDeleted, WhetherEnum.NO.getCode())
+                .eq(FlowAudit::getDeleted, YesNoEnum.NO.getCode())
                 .orderByDesc(FlowAudit::getCreateTime)
                 .last("limit 1"));
         String previousStatus = "";

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/service/impl/StrainCustomInfoServiceImpl.java

@@ -3,7 +3,7 @@ package com.github.jfcloud.gene.form.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.form.dto.StrainCustomDto;
 import com.github.jfcloud.gene.form.entity.StrainCustomDetail;
@@ -51,7 +51,7 @@ public class StrainCustomInfoServiceImpl extends ServiceImpl<StrainCustomInfoMap
     public void updateForm(StrainCustomVo vo) {
         StrainCustomInfo info = getOne(new LambdaQueryWrapper<>(StrainCustomInfo.class)
                 .eq(StrainCustomInfo::getFlowId, vo.getFlowId())
-                .eq(StrainCustomInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(StrainCustomInfo::getDeleted, YesNoEnum.NO.getCode()));
         if (info == null) {
             saveForm(vo);
             return;
@@ -79,7 +79,7 @@ public class StrainCustomInfoServiceImpl extends ServiceImpl<StrainCustomInfoMap
     public StrainCustomDto getByFlowId(Long flowId) {
         StrainCustomInfo info = getOne(new LambdaQueryWrapper<StrainCustomInfo>()
                 .eq(StrainCustomInfo::getFlowId, flowId)
-                .eq(StrainCustomInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(StrainCustomInfo::getDeleted, YesNoEnum.NO.getCode()));
         if (info == null) {
             return null;
         }
@@ -87,7 +87,7 @@ public class StrainCustomInfoServiceImpl extends ServiceImpl<StrainCustomInfoMap
         StrainCustomDto dto = BeanUtil.copyProperties(info, StrainCustomDto.class);
         List<StrainCustomDetail> detailList = strainCustomDetailService.list(new LambdaQueryWrapper<StrainCustomDetail>()
                 .eq(StrainCustomDetail::getStrainCustomBasicId, info.getId())
-                .eq(StrainCustomDetail::getDeleted, WhetherEnum.NO.getCode())
+                .eq(StrainCustomDetail::getDeleted, YesNoEnum.NO.getCode())
                 .orderByAsc(StrainCustomDetail::getId));
         dto.setDetailList(BeanUtil.copyToList(detailList, StrainCustomDetailVo.class));
         return dto;

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/service/impl/StrainPurificationInfoServiceImpl.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.file.entity.FileInfo;
 import com.github.jfcloud.gene.file.service.FileInfoService;
@@ -97,7 +97,7 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
     public void updateForm(StrainPurificationInfoVo vo) {
         StrainPurificationInfo info = getOne(new LambdaQueryWrapper<>(StrainPurificationInfo.class)
                 .eq(StrainPurificationInfo::getFlowId, vo.getFlowId())
-                .eq(StrainPurificationInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(StrainPurificationInfo::getDeleted, YesNoEnum.NO.getCode()));
 
         if (info == null) {
             saveForm(vo);
@@ -122,7 +122,7 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
     public StrainPurificationInfoDto getByFlowId(Long id) {
         StrainPurificationInfo info = getOne(new LambdaQueryWrapper<StrainPurificationInfo>()
                 .eq(StrainPurificationInfo::getFlowId, id)
-                .eq(StrainPurificationInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(StrainPurificationInfo::getDeleted, YesNoEnum.NO.getCode()));
         if (info == null) {
             return null;
         }
@@ -135,12 +135,12 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
         //动物需求
         List<AnimalDemand> animalDemandList = animalDemandService.list(new LambdaQueryWrapper<AnimalDemand>()
                 .eq(AnimalDemand::getPurificationId, info.getId())
-                .eq(AnimalDemand::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(AnimalDemand::getDeleted, YesNoEnum.NO.getCode()));
         dto.setAnimalDemands(BeanUtil.copyToList(animalDemandList, AnimalDemandVo.class));
         //笼位需求
         List<CageDemand> cageDemands = cageDemandService.list(new LambdaQueryWrapper<CageDemand>()
                 .eq(CageDemand::getPurificationId, info.getId())
-                .eq(CageDemand::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(CageDemand::getDeleted, YesNoEnum.NO.getCode()));
         dto.setCageDemands(BeanUtil.copyToList(cageDemands, CageDemandVo.class));
         //附件
         dto.setTestingFiles(fileInfoService.listByRelateId(info.getId()));

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/controller/SampleLisController.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
-import com.github.jfcloud.common.annotation.WebApiLog;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.gene.lis.config.LisDb;
 import com.github.jfcloud.gene.lis.constants.LisDictType;
@@ -30,7 +29,6 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Tag(name = "样本送检-LIS")
-@WebApiLog
 @RestController
 @RequestMapping("/sample/lis")
 @RequiredArgsConstructor

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/controller/SampleController.java

@@ -4,9 +4,8 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Pair;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jfcloud.common.annotation.WebApiLog;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.file.vo.FileDetail;
 import com.github.jfcloud.gene.flow.service.FlowInfoService;
@@ -36,7 +35,6 @@ public class SampleController {
     private final SampleInfoService sampleInfoService;
     private final FlowInfoService flowInfoService;
 
-    @WebApiLog
     @Operation(summary = "列表查询")
     @GetMapping("/page")
     public R<Page<SamplePageDto>> page(SamplePageVo vo) {
@@ -55,7 +53,6 @@ public class SampleController {
         return R.ok(GeneStatusEnum.getSampleStatusList());
     }
 
-    @WebApiLog
     @Operation(summary = "新增")
     @PostMapping
     public R save(@Valid @RequestBody SampleSubmitVo vo) {
@@ -63,7 +60,6 @@ public class SampleController {
         return R.ok();
     }
 
-    @WebApiLog
     @Operation(summary = "编辑")
     @PostMapping("/edit/{id}")
     public R update(@PathVariable Long id, @Valid @RequestBody SampleSubmitVo vo) {
@@ -92,7 +88,6 @@ public class SampleController {
         return R.ok();
     }
 
-    @WebApiLog
     @Operation(summary = "审核")
     @PostMapping("/audit/{id}")
     public R audit(@PathVariable Long id, @Valid @RequestBody SampleAuditVo vo) {
@@ -106,7 +101,6 @@ public class SampleController {
         return R.ok(sampleInfoService.getAuditRecords(id));
     }
 
-    @WebApiLog
     @Operation(summary = "执行")
     @PostMapping("/execute/{id}")
     public R execute(@PathVariable Long id, @RequestBody @Valid SynProjectVo vo) {
@@ -129,7 +123,7 @@ public class SampleController {
                 .select(SampleInfo::getId)
                 .eq(id != null, SampleInfo::getId, id)
                 .eq(kyId != null, SampleInfo::getKyId, kyId)
-                .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode()));
         if (sampleInfo == null) {
             return R.failed("找不到对应的流程");
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalImagingServiceImpl.java

@@ -11,9 +11,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.file.service.FileInfoService;
@@ -259,7 +259,7 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
     public SampleAnimalImagingVo getDetail(Long sampleId) {
         SampleAnimalImaging animalImaging = getOne(new LambdaQueryWrapper<>(SampleAnimalImaging.class)
                 .eq(SampleAnimalImaging::getSampleId, sampleId)
-                .eq(SampleAnimalImaging::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(SampleAnimalImaging::getDeleted, YesNoEnum.NO.getCode()));
         if (animalImaging == null) {
             return null;
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
 import com.github.jfcloud.gene.common.constant.WhetherEnum;
@@ -352,7 +353,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
     public SampleAnimalVo getDetail(Long sampleId) {
         SampleAnimal sampleAnimal = getOne(new LambdaQueryWrapper<>(SampleAnimal.class)
                 .eq(SampleAnimal::getSampleId, sampleId)
-                .eq(SampleAnimal::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(SampleAnimal::getDeleted, YesNoEnum.NO.getCode()));
         if (sampleAnimal == null) {
             return null;
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleFoodServiceImpl.java

@@ -17,7 +17,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
-import com.github.jfcloud.common.holder.RequestHolder;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
 import com.github.jfcloud.gene.common.constant.WhetherEnum;
@@ -44,6 +44,7 @@ import com.github.jfcloud.gene.sample.vo.SampleFoodVo;
 import com.github.jfcloud.gene.sample.vo.SampleSubmitVo;
 import com.github.jfcloud.gene.sys.service.DBSystemPropertiesService;
 import com.github.jfcloud.gene.util.ExcelImageService;
+import com.github.jfcloud.web.controller.JfcloudRestController;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.docx4j.openpackaging.packages.SpreadsheetMLPackage;
@@ -145,7 +146,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
         checkbox(mappings, "样品储存要求", "☐室温   ☐冷藏（0℃~8℃）   ☐冷冻（≤18℃）   ☐避光   ☐干燥   ☐其他", detail.getStorageRequirements());
         mappings.put("样品储存要求-其他", detail.getStorageRequirements().contains("其他") ?  detail.getStorageRequirementsOther(): "");
         checkbox(mappings, "样品保留期限", "☐常规样品一个月（默认）   ☐新鲜产品一周   ☐冷冻产品三周", detail.getRetentionPeriod());
-        mappings.put("非危险性样品", (WhetherEnum.NO.getCode().equals(detail.getHazard()) ? "☑" : "☐") + "非危险性样品");
+        mappings.put("非危险性样品", (YesNoEnum.NO.getCode().equals(detail.getHazard()) ? "☑" : "☐") + "非危险性样品");
         checkbox(mappings, "危险性样品", "☐易燃易爆  ☐腐蚀性  ☐毒性（非剧毒） ☐氧化剂  ☐其他", detail.getHazardDescription());
         mappings.put("危险性样品-其他", detail.getHazardDescription().contains("其他") ?  detail.getHazardDescriptionOther(): "");
         checkbox(mappings, "服务时限", "☐标准时间（7个工作日）   ☐5个工作日 \n\n☐3个工作日   ☐1个工作日 \n\n☐加急", detail.getServiceDeadline());
@@ -291,7 +292,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
 
             //上传服务器
             FileVo fileVo = fileInfoService.uploadFileWithFileName(Files.newInputStream(tmpFile.toPath()), targetFileName);
-            HttpServletRequest request = RequestHolder.getRequest();
+            HttpServletRequest request = JfcloudRestController.request();
             new FlowFileVersion()
                     .setFlowId(sampleInfo.getId())
                     .setFlowStatus(sampleInfo.getStatus())

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SamplePathologicalServiceImpl.java

@@ -13,9 +13,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.file.entity.FileInfo;
@@ -289,7 +289,7 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
     public SamplePathologicalVo getDetail(Long sampleId) {
         SamplePathological samplePathological = getOne(new LambdaQueryWrapper<>(SamplePathological.class)
                 .eq(SamplePathological::getSampleId, sampleId)
-                .eq(SamplePathological::getDeleted, WhetherEnum.NO.getCode()));
+                .eq(SamplePathological::getDeleted, YesNoEnum.NO.getCode()));
         if (samplePathological == null) {
             return null;
         }
@@ -304,7 +304,7 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         //附件列表
         List<FileInfo> fileInfos = fileInfoService.list(new LambdaQueryWrapper<>(FileInfo.class)
                 .eq(FileInfo::getRelateId, samplePathological.getId())
-                .eq(FileInfo::getDeleted, WhetherEnum.NO.getCode())
+                .eq(FileInfo::getDeleted, YesNoEnum.NO.getCode())
                 .orderByAsc(FileInfo::getId));
         if (CollUtil.isNotEmpty(fileInfos)) {
             pathologicalVo.getSampleInfoFiles().addAll(fileInfos.stream()

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.common.data.datascope.DataScope;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
-import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
 import com.github.jfcloud.gene.common.util.UserUtil;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
@@ -96,7 +96,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         if (StrUtil.isNotBlank(vo.getProjectNo())) {
             long count = count(new LambdaQueryWrapper<>(SampleInfo.class)
                     .eq(SampleInfo::getProjectNo, vo.getProjectNo())
-                    .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
+                    .eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode()));
             Assert.isTrue(count < 1, "项目编号已存在");
         }
 
@@ -124,7 +124,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             long count = count(new LambdaQueryWrapper<>(SampleInfo.class)
                     .ne(SampleInfo::getId, id)
                     .eq(SampleInfo::getProjectNo, vo.getProjectNo())
-                    .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
+                    .eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode()));
             Assert.isTrue(count < 1, "项目编号已存在");
         }
 
@@ -188,7 +188,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
                 .eq(StrUtil.isNotBlank(vo.getType()), SampleInfo::getType, vo.getType())
                 .eq(StrUtil.isNotBlank(vo.getStatus()), SampleInfo::getStatus, vo.getStatus())
                 .eq(Objects.nonNull(vo.getApplicantId()), SampleInfo::getApplicantId, vo.getApplicantId())
-                .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode())
+                .eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode())
                 .orderByDesc(SampleInfo::getCreateTime);
         if (StrUtil.isNotBlank(vo.getProject())) {
             wrapper.and(i -> i.like(SampleInfo::getProjectNo, vo.getProject()).or()
@@ -298,7 +298,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             //检查批准编号的唯一性
             long count = count(new LambdaQueryWrapper<>(SampleInfo.class)
                     .eq(SampleInfo::getApprovalNo, vo.getApprovalNo())
-                    .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
+                    .eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode()));
             Assert.isTrue(count < 1, "项目批准编号已存在");
         }
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/util/WordDataService.java

@@ -1,12 +1,12 @@
 package com.github.jfcloud.gene.util;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import com.amazonaws.services.s3.model.S3Object;
 import com.github.jfcloud.common.file.core.FileTemplate;
-import com.github.jfcloud.common.util.DateUtil;
-import com.github.jfcloud.common.util.UserUtil;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
+import com.github.jfcloud.gene.common.util.UserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,8 +33,6 @@ public class WordDataService {
      * 填充文档创建人、创建时间、修改人、修改时间
      *
      * @param dataMap
-     * @param createById 文档创建人id
-     * @param createTime 文档创建时间
      */
     public void fillDocCreator(Map<String, Object> dataMap) {
         fillDocCreator(dataMap, UserUtil.getUserId(), new Date());
@@ -59,7 +57,7 @@ public class WordDataService {
         dataMap.put("docLastModifiedTime", getISO8601Date(new Date()));
 
         //当前年份、月份、日
-        String[] split = DateUtil.formatDay(new Date()).split("-");
+        String[] split = DateUtil.today().split("-");
         dataMap.put("currentYear", split[0]);
         dataMap.put("currentMonth", split[1]);
         dataMap.put("currentDay", split[2]);

jfcloud-gene-common/src/main/java/com/github/jfcloud/gene/common/constant/WhetherEnum.java

@@ -29,15 +29,7 @@ public enum WhetherEnum {
         return code;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getLabel() {
         return label;
     }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
 }

pom.xml

@@ -23,7 +23,7 @@
     <hutool.version>5.8.22</hutool.version>
     <lombok.version>1.18.16</lombok.version>
     <mapstruct.version>1.4.2.Final</mapstruct.version>
-    <jfcloud-bom.version>K7.1.0</jfcloud-bom.version>
+    <jfcloud-bom.version>K7.2.0</jfcloud-bom.version>
   </properties>
 
   <dependencies>