浏览代码

模板映射添加

rengb 5 年之前
父节点
当前提交
cc4fcddfc6

+ 34 - 0
dbanaly/src/main/java/com/lantone/qc/dbanaly/controller/DbController.java

@@ -0,0 +1,34 @@
+package com.lantone.qc.dbanaly.controller;
+
+import com.lantone.qc.dbanaly.facade.comsis.ModuleHelper;
+import com.lantone.qc.pub.res.Response;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName : QCController
+ * @Description : 质控总入口
+ * @Author : 楼辉荣
+ * @Date: 2020-03-03 19:57
+ */
+@Api(value = "数据对接接口", tags = { "数据对接接口" })
+@RestController
+@RequestMapping(value = "/db")
+public class DbController {
+
+    @Autowired
+    private ModuleHelper moduleHelper;
+
+    @ApiOperation(value = "模板信息加载")
+    @PostMapping("loadModuleInfo")
+    public Response<Boolean> loadModuleInfo() {
+        Response response = new Response();
+        response.setData(moduleHelper.loadModuleInfo());
+        return response;
+    }
+
+}

+ 22 - 7
dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/ModuleHelper.java

@@ -12,6 +12,7 @@ import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeDetailServiceImpl;
 import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeServiceImpl;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.util.ListUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,6 +28,7 @@ import java.util.stream.Collectors;
  * @author: rengb
  * @time: 2020/5/29 17:10
  */
+@Slf4j
 @Component
 public class ModuleHelper {
     @Autowired
@@ -44,17 +46,27 @@ public class ModuleHelper {
     @Value("${qc.hospital_id}")
     private String hospitalIds;
 
-    public void loadModuleInfo() {
-        List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "3");
-        for (String hospitalId : hospitalIds.split(",")) {
-            if (!xmlDataTypeHospitalIds.contains(hospitalId)) {
-                continue;
+    /**
+     * 加载医院模板映射信息
+     */
+    public boolean loadModuleInfo() {
+        try {
+            List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "3");
+            for (String hospitalId : hospitalIds.split(",")) {
+                if (!xmlDataTypeHospitalIds.contains(hospitalId)) {
+                    continue;
+                }
+                loadModuleInfoByHospitalId(hospitalId);
             }
-            loadModuleInfoByHospitalId(hospitalId);
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            ModuleMappingUtil.xmlDataTypeModuleInfo.clear();
+            return false;
         }
     }
 
-    public void loadModuleInfoByHospitalId(String hospitalId) {
+    private void loadModuleInfoByHospitalId(String hospitalId) {
         Map<Set<String>, String> result = Maps.newHashMap();
         QueryWrapper<ModuleInfo> moduleInfoQe = new QueryWrapper<>();
         moduleInfoQe.eq("is_deleted", "N");
@@ -79,6 +91,9 @@ public class ModuleHelper {
         Map<Long, String> recordIdModuleIdMap = moduleMappingList.stream().collect(Collectors.toMap(i -> i.getRecordId(), i -> i.getModuleId().toString()));
         List<Long> recordIds = moduleMappingList.stream().map(i -> i.getRecordId()).collect(Collectors.toList());
         recordIds = recordAnalyzeService.listByIds(recordIds).stream().filter(i -> i.getIsDeleted().equals("N")).map(i -> i.getId()).collect(Collectors.toList());
+        if (ListUtil.isEmpty(recordIds)) {
+            return;
+        }
 
         QueryWrapper<RecordAnalyzeDetail> recordAnalyzeDetailQe = new QueryWrapper<>();
         recordAnalyzeDetailQe.in("record_analyze_id", recordIds);

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/entity/Abnormal.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/entity/Mode.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/entity/ModuleInfo.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/mapper/AbnormalMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface AbnormalMapper extends BaseMapper<Abnormal> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/mapper/ModeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface ModeMapper extends BaseMapper<Mode> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/mapper/ModuleInfoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface ModuleInfoMapper extends BaseMapper<ModuleInfo> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/AbnormalService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface AbnormalService extends IService<Abnormal> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/ModeService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface ModeService extends IService<Mode> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/ModuleInfoService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 public interface ModuleInfoService extends IService<ModuleInfo> {
 

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/impl/AbnormalServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Service
 public class AbnormalServiceImpl extends ServiceImpl<AbnormalMapper, Abnormal> implements AbnormalService {

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/impl/ModeServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Service
 public class ModeServiceImpl extends ServiceImpl<ModeMapper, Mode> implements ModeService {

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/service/impl/ModuleInfoServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author rgb
- * @since 2020-05-29
+ * @since 2020-06-01
  */
 @Service
 public class ModuleInfoServiceImpl extends ServiceImpl<ModuleInfoMapper, ModuleInfo> implements ModuleInfoService {

+ 26 - 0
dbanaly/src/main/java/com/lantone/qc/dbanaly/order/ModuleOrder.java

@@ -0,0 +1,26 @@
+package com.lantone.qc.dbanaly.order;
+
+import com.lantone.qc.dbanaly.facade.comsis.ModuleHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description : 页面模板映射信息加载
+ * @Author : rgb
+ * @Date: 2020-03-11 11:42
+ */
+@Order(1)
+@Component
+public class ModuleOrder implements ApplicationRunner {
+
+    @Autowired
+    private ModuleHelper moduleHelper;
+
+    public void run(ApplicationArguments var1) {
+        moduleHelper.loadModuleInfo();
+    }
+
+}

文件差异内容过多而无法显示
+ 0 - 1
kernel/src/main/resources/cache/1/module_mapping.json


文件差异内容过多而无法显示
+ 0 - 1
kernel/src/main/resources/cache/3/module_mapping.json