Browse Source

统一api版本管理

陈长荣 3 months ago
parent
commit
1fc2fa1a1a

+ 0 - 3
jfcloud-gene-biz/pom.xml

@@ -60,19 +60,16 @@
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-aew-rich-text</artifactId>
-      <version>k7.2.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-project-api</artifactId>
-      <version>k7.2.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-ac-project-api</artifactId>
-      <version>K7.2.0</version>
     </dependency>
 
     <dependency>

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

@@ -350,6 +350,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         return auditDtos;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void execute(Long id, SynProjectVo vo) {
         if (!systemPropertiesService.getBooleanValue("sample.sync.ky")) {
@@ -394,11 +395,13 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
 
         log.info("样本送检推送科研项目:flowId={}, param={}", id, JSON.toJSONString(projectFeignDTO));
         R<Long> longR = remoteProjectService.initProject(projectFeignDTO);
+        log.info("科研响应:{}", JSON.toJSONString(longR));
         if (!longR.isOk()) {
             log.error("projectId={}推送科研失败,{}", id, longR);
+            throw new IllegalArgumentException("推送科研失败");
         }
-        Assert.isTrue(longR.isOk(), "操作失败,科研" + longR);
         Long kyId = longR.getData();
+        Assert.notNull(kyId, "推送科研失败,科研id为空");
         new SampleInfo().setId(id).setKyId(kyId).updateById();
 
         if (kyId != null && systemPropertiesService.getBooleanValue("sample.sync.animal")) {

+ 6 - 0
pom.xml

@@ -24,6 +24,7 @@
     <lombok.version>1.18.16</lombok.version>
     <mapstruct.version>1.4.2.Final</mapstruct.version>
     <jfcloud-bom.version>K7.5.0</jfcloud-bom.version>
+    <jfcloud-dependencies.version>K7.5.0</jfcloud-dependencies.version>
   </properties>
 
   <dependencies>
@@ -44,6 +45,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.jfcloud</groupId>
+        <artifactId>jfcloud-aew-rich-text</artifactId>
+        <version>${jfcloud-dependencies.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>