解析采集数据优化；

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

@@ -2,31 +2,30 @@ package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
-import com.patzn.cloud.commons.controller.LoginHelper;
-import com.patzn.cloud.service.hmhj.entity.*;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
 import com.patzn.cloud.service.hmhj.vo.CollectionVO;
 import com.patzn.cloud.service.hmhj.vo.OriginalRecordInfoVO;
 import com.patzn.cloud.service.lims.collection.entity.LmsOriginalRecordInfo;
 import com.patzn.cloud.service.lims.collection.entity.OriginalAtlas;
 import com.patzn.cloud.service.lims.hmhj.mapper.LmsOriginalRecordInfoMapper;
-import com.patzn.cloud.service.lims.hmhj.service.*;
-import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
+import com.patzn.cloud.service.lims.hmhj.service.ILmsOriginalRecordInfoService;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateConfigService;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 原始记录解析后的数据存储表 服务实现类
@@ -38,21 +37,12 @@ import java.util.stream.Collectors;
 public class LmsOriginalRecordInfoServiceImpl extends BaseServiceImpl<LmsOriginalRecordInfoMapper, LmsOriginalRecordInfo> implements ILmsOriginalRecordInfoService {
 
     @Autowired
-    private IEntrustService entrustService;
-
-    @Autowired
     private IOriginalTemplateService originalTemplateService;
 
     @Autowired
     private IOriginalTemplateConfigService originalTemplateConfigService;
 
     @Autowired
-    private IEntrustSampleService entrustSampleService;
-
-    @Autowired
-    private IEntrustSampleItemService entrustSampleItemService;
-
-    @Autowired
     private IEntrustSampleItemIndexService entrustSampleItemIndexService;
 
     @Override
@@ -73,7 +63,7 @@ public class LmsOriginalRecordInfoServiceImpl extends BaseServiceImpl<LmsOrigina
 
         OriginalTemplate template = originalTemplateService.getById(templateId);
         RestAssert.fail(null == template, "原始记录模板为空");
-        String tempName = template.getName();
+        // String tempName = template.getName();
         // 需要采集的指标项
         List<OriginalTemplateConfig> configList = originalTemplateConfigService.list(Condition.create()
                 .eq("template_id", template).eq("itemed", 1).eq("deleted", 0));
@@ -84,8 +74,6 @@ public class LmsOriginalRecordInfoServiceImpl extends BaseServiceImpl<LmsOrigina
         RestAssert.fail(CollectionUtils.isEmpty(originalRecordInfoList), "所选检测项目对应的采集数据不存在");
         List<EntrustSampleItemIndex> itemIndexList = new ArrayList<>();
         // 具体逻辑需要额外处理
-        // 目前不清楚字段content和abs代表的含义
-        // and so on ...
         //
         for (OriginalRecordInfoVO vo : originalRecordInfoList) {
             // OriginalAtlas data = JSONObject.parseObject(vo.getData(),OriginalAtlas.class);
@@ -128,11 +116,6 @@ public class LmsOriginalRecordInfoServiceImpl extends BaseServiceImpl<LmsOrigina
 
                 itemIndexList.add(itemIndex);
             }
-
-            // 曲线信息
-            if (CollectionUtils.isNotEmpty(data.getCurveData())) {
-
-            }
         }
 
         if (CollectionUtils.isNotEmpty(itemIndexList)) {