去除无用配置文件

.gitignore

@@ -5,4 +5,5 @@ gradle*
 Dockerfile
 Jenkinsfile-test
 libs
-*env.json
\ No newline at end of file
+*env.json
+*.log
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustRecordServiceImpl.java

@@ -64,6 +64,8 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
             entrustRecord.setOrigin(from);
             entrustRecord.setTarget(to);
             entrustRecord.setType(type);
+            entrustRecord.setCompanyId(account.getCompanyId());
+            entrustRecord.setUid(account.getUserId());
             entrustRecord.setRemark(remark);
 
             saveRecord.add(entrustRecord);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -1980,7 +1980,8 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     @Override
     public List<Long> getTesterIdListByEntrustId(Long entrustId) {
         List<EntrustSampleItem> sampleItems = getListByEntrustId(entrustId);
-        return CollectionUtils.isEmpty(sampleItems) ? null : sampleItems.stream().map(EntrustSampleItem::getTesterId).collect(Collectors.toList());
+        return Optional.ofNullable(sampleItems).orElse(new ArrayList<>()).stream().map(EntrustSampleItem::getTesterId)
+                .filter(Objects::nonNull).distinct().collect(Collectors.toList());
     }
 
     @Override

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -650,6 +650,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         Entrust entrust = entrustDTO.convert(Entrust.class);
         entrust.setSampleName(sampleList.get(0).getName());
         if (updateById(entrust)) {
+            final Long entrustId = entrust.getId();
             List<EntrustSample> updateSampleList = new ArrayList<>();
             List<EntrustSample> saveSampleList = new ArrayList<>();
 
@@ -657,13 +658,13 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             int incNum = 10;
             for (EntrustSampleDTO dto : sampleList) {
                 EntrustSample sample = dto.convert(EntrustSample.class);
+                sample.setEntrustId(entrustId);
                 sample.setOrderBy(incNum);
                 incNum += 10;
                 boolean isInsert = false;
                 // 如果室新增的样品
                 if (null == sample.getId()) {
                     isInsert = true;
-                    sample.setEntrustId(entrust.getId());
                     sample.setId(IdWorker.getId());
                 }
                 if (isSubmit) {
@@ -694,7 +695,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                         if (null == item.getId()) {
                             item.setId(IdWorker.getId());
                             item.setEntrustSampleId(sample.getId());
-                            item.setEntrustId(entrust.getId());
+                            item.setEntrustId(entrustId);
                             item.setStatus(EntrustSampleItemStatusEnum.DRAFT);
                             item.setProgress(EntrustSampleItemStatusEnum.DRAFT);
                             saveItemList.add(item);
@@ -713,15 +714,14 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             if (CollectionUtils.isNotEmpty(saveItemList)) {
                 entrustSampleItemService.saveBatch(saveItemList);
             }
-        }
-
-        entrustSampleItemService.updateItemComposeJudgeByEntrustId(entrust.getId());
 
-        CompletableFuture.runAsync(() -> {
-            // 委托费用
-            calTotalFee(entrust.getId());
-        });
+            entrustSampleItemService.updateItemComposeJudgeByEntrustId(entrustId);
 
+            CompletableFuture.runAsync(() -> {
+                // 委托费用
+                calTotalFee(entrustId);
+            });
+        }
         return true;
     }
 
@@ -988,8 +988,10 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         if (!isUpdateSampleInfo) {
             return true;
         }
-        // 修改样品信息及其样品附属信息
-        entrustSampleService.updateSampleNextFlowInfo(entrust, nextFlowStatus, account);
+        // 异步修改样品信息及其样品附属信息
+        CompletableFuture.runAsync(() -> {
+            entrustSampleService.updateSampleNextFlowInfo(entrust, nextFlowStatus, account);
+        });
         // 修改委托状态信息
         entrust.setStatus(nextStatus);
         entrust.setProgress(nextStatus);

src/main/resources/application-dev.yml

@@ -11,20 +11,15 @@ service:
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-#    url: jdbc:postgresql://localhost:5432/dev_lims_meter
     username: postgres
-    password: 123456
-    url: jdbc:postgresql://192.168.0.115:5432/dev_lims_hmhj
+    password: www.163.com
+    url: jdbc:postgresql://192.168.0.140:5432/dev_lims_hmhj
     driver-class-name: org.postgresql.Driver
     dynamic:
       enabled: false
   # 注册中心配置
   cloud:
-    consul:
-      host: 192.168.0.115
-      discovery:
-        health-check-interval: 5s
-  #      host: localhost
+    consul: localhost
   rabbitmq:
     host: 124.70.150.247
     port: 5672
@@ -38,19 +33,25 @@ spring:
       equip-check-msg: dev.topic.equip.check.msg
       report-make-msg: dev.topic.report.make.msg
       hmhj-work-msg: dev.topic.hmhj.work.msg
+  # Mongodb GridFS
+  data:
+    mongodb:
+      uri: mongodb://limsAdmin:devpt12!mg@192.168.0.140:27017/lims
+      grid-fs-database: lims
+  redis:
+    host: 192.168.0.140
+    port: 6379
+    password: 123456
 
+# 对象存储配置
+oss:
+  grid-fs: true
+  bucket-name: base
 
 ### jobs
 jobs:
   admin-address: http://api.dev.patzn.com:7000/print
 
-
-# 对象存储配置
-oss:
-  bucket-name: pt-web-sys
-  aliyun:
-    endpoint: http://oss.test.patzn.com
-    folder: dev/hmhj
 #libreOffice 安装信息
 libreOffice:
   url: C:/Program Files/LibreOffice

src/main/resources/application-local.yml

@@ -56,7 +56,7 @@ spring:
   data:
     mongodb:
       #uri: mongodb://limsAdmin:devpt12!mg@192.168.0.142:27017/lims
-      uri: mongodb://mongo:Mong$6358#@localhost:27017/lims
+      uri: mongodb://mongo:Mong$6358#@meazty.fun:27154/lims
       grid-fs-database: lims
 
 # Mongodb GridFS 存储

src/main/resources/application-test151.yml

@@ -13,6 +13,7 @@ service:
   province-item-url: http://60.216.97.250:8087/
   soffice: /opt/libreoffice6.2/program/soffice
   static-url: static.hmlims.com:9000
+  erp-url: http://192.168.0.19:5050/api/LimsData/SaveData
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource

src/main/resources/application-ys.yml

-# 测试环境
-server:
-  exception:
-    to: 1327531085@qq.com;18463106881@163.com
-    form: ptlims_test@163.com
-    subject: 测试 hmhj服务异常
-swagger:
-  enable: true
-service:
-  api-url: http://api.ys.patzn.com
-  url: http://api.ys.patzn.com
-  food-url: http://food.ys.patzn.com
-  province-item-url: http://60.216.97.250:8087/
-  soffice: /opt/libreoffice6.2/program/soffice
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://39.103.208.182:5432/pc_lims_hmhj
-    username: dbhmhj
-    password: svfYEhgW586e!$6
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: 121.89.205.20
-  redis:
-    host: 121.89.205.20
-    password: ysadmin63Tba
-  mail:
-    host: smtp.163.com
-    username: ptlims_test@163.com
-    password: QTXWOTEUSHARYDWT
-    port: 25
-    protocol: smtp
-    default-encoding: UTF-8
-  rabbitmq:
-    host: 121.89.205.20
-    port: 5672
-    username: ysadmin
-    password: ysadmin63$%64
-    virtual-host: /
-    topic:
-      push-msg: pro.topic.push.msg
-      sys-log: pro.topic.sys.log
-      chemical-classify-warning: pro.topic.chemical.classify.warning
-      equip-check-msg: pro.topic.equip.check.msg
-      report-make-msg: pro.topic.report.make.msg
-      soil-work-msg: test.topic.soil.work.msg
-      hmhj-work-msg: pro.topic.hmhj.work.msg
-
-# 对象存储配置
-oss:
-  aliyun:
-    folder: hmhj
-
-#libreOffice 安装信息
-libreOffice:
-  url: /opt/libreOffice6.2
-### jobs
-jobs:
-  admin-address: http://api.ys.patzn.com/print
\ No newline at end of file