zhoutg 5 vuotta sitten
vanhempi
commit
2842dec923

+ 1 - 1
config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

+ 1 - 1
config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/med_back?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

+ 1 - 1
config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

+ 1 - 1
config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

+ 10 - 4
knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -8,7 +8,6 @@ import com.diagbot.client.NeoServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.DiagnoseDetailSaveDTO;
 import com.diagbot.dto.DiagnosePageDTO;
-import com.diagbot.dto.LibraryForDiagnoseDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VerifyDataDTO;
 import com.diagbot.entity.CommonParam;
@@ -149,13 +148,14 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     }
 
 
-    public void addTest() {
+    public String addTest() {
+        StringBuffer sb = new StringBuffer();
         List<Diagnose> diagnoseList = this.list(new QueryWrapper<Diagnose>()
             .eq("is_deleted", IsDeleteEnum.N.getKey())
         );
         List<String> disName = diagnoseList.stream().map(row -> row.getDisName()).collect(Collectors.toList());
         List<LibraryInfo> diagnoses = libraryInfoFacade.page(
-                new Page().setSize(50L), new QueryWrapper<LibraryInfo>()
+                new Page().setSize(100L), new QueryWrapper<LibraryInfo>()
                 .eq("type_id", 18)
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("is_concept", 1)
@@ -169,7 +169,10 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             bean.setModifier("测试9");
             diagnoseData.add(bean);
         }
+        Long time1 = System.currentTimeMillis();
         diagnoseService.saveBatch(diagnoseData);
+        Long time2 = System.currentTimeMillis();
+        sb.append("添加主表测试数据:" + (time2-time1)/1000.00 + "秒");
 
         List<DiagnoseDetail> diagnoseDetailList = new ArrayList<>();
         List<DiagnoseDetail> diagnoseDetailData = diagnoseDetailFacade.list(new QueryWrapper<DiagnoseDetail>().eq("diagnose_id", 7L));
@@ -180,10 +183,12 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 newDiagDetail.setId(null);
                 newDiagDetail.setDiagnoseId(diagnose.getId());
                 newDiagDetail.setDisName(diagnose.getDisName());
+                newDiagDetail.setIsDeleted(IsDeleteEnum.N.getKey());
                 diagnoseDetailList.add(newDiagDetail);
             }
         }
         diagnoseDetailService.saveBatch(diagnoseDetailList);
+        return sb.toString();
     }
 
 
@@ -411,7 +416,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
             // 更新明细
             if (ListUtil.isNotEmpty(diagnoseDetailList)) {
-                diagnoseDetailService.updateBatchById(diagnoseDetailList);
+//                diagnoseDetailService.updateBatchById(diagnoseDetailList);
+                diagnoseDetailService.updateBatch(diagnoseDetailList);
             }
 
             Long time5 = System.currentTimeMillis();

+ 5 - 1
knowledgeman-service/src/main/java/com/diagbot/mapper/DiagnoseDetailMapper.java

@@ -1,7 +1,9 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.DiagnoseDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.DiagnoseDetail;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DiagnoseDetailMapper extends BaseMapper<DiagnoseDetail> {
 
+
+    public void updateBatch(List<DiagnoseDetail> diagnoseDetails);
 }

+ 4 - 1
knowledgeman-service/src/main/java/com/diagbot/service/DiagnoseDetailService.java

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.DiagnoseDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.DiagnoseDetail;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DiagnoseDetailService extends IService<DiagnoseDetail> {
 
+    public void updateBatch(List<DiagnoseDetail> diagnoseDetails);
 }

+ 6 - 0
knowledgeman-service/src/main/java/com/diagbot/service/impl/DiagnoseDetailServiceImpl.java

@@ -6,6 +6,8 @@ import com.diagbot.service.DiagnoseDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 诊断依据明细表 服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class DiagnoseDetailServiceImpl extends ServiceImpl<DiagnoseDetailMapper, DiagnoseDetail> implements DiagnoseDetailService {
 
+    @Override
+    public void updateBatch(List<DiagnoseDetail> diagnoseDetails) {
+        baseMapper.updateBatch(diagnoseDetails);
+    }
 }

+ 3 - 3
knowledgeman-service/src/main/java/com/diagbot/web/DiagnoseController.java

@@ -128,8 +128,8 @@ public class DiagnoseController {
     @PostMapping("/add")
     @SysLogger("add")
     @ApiIgnore
-    public RespDTO<Boolean> addTest() {
-        diagnoseFacade.addTest();
-        return RespDTO.onSuc(true);
+    public RespDTO<String> addTest() {
+        String str = diagnoseFacade.addTest();
+        return RespDTO.onSuc(str);
     }
 }

+ 17 - 0
knowledgeman-service/src/main/resources/mapper/DiagnoseDetailMapper.xml

@@ -26,4 +26,21 @@
         <result column="verify_formula" property="verifyFormula" />
     </resultMap>
 
+    <update id="updateBatch">
+        <foreach collection="list" item="item"  separator=";">
+            update kl_diagnose_detail
+            <set>
+                <if test="item.verifyStandard != null">
+                    verify_standard = #{item.verifyStandard},
+                </if>
+                <if test="item.verifyRelation != null">
+                    verify_relation = #{item.verifyRelation},
+                </if>
+                <if test="item.verifyResult != null">
+                    verify_result = #{item.verifyResult}
+                </if>
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>