标准采集上传模块调整

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java

@@ -11,6 +11,7 @@ import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
@@ -26,7 +27,7 @@ public class CrawlerManager {
    private static volatile CrawlerManager instance;
    private static DataCollectDispatcher dispatch;
    private List<AdapterDataSet> adapterDataSetList;
    private String version;
    private Boolean adapterFlg = false;
    private List<Patient> patientList;
    public CrawlerManager() {
        dispatch = DataCollectDispatcher.getInstance();
@@ -132,13 +133,14 @@ public class CrawlerManager {
    }
    public Boolean getAdapterDataSetList() {
        if (StringUtil.isEmpty(version)) {
        if (!adapterFlg) {
            adapterDataSetList = new ArrayList<>();
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            version = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (StringUtil.isEmpty(version)) {
            AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (adapterSchemeVersionModel == null) {
                return false;
            }
            String version = adapterSchemeVersionModel.getVersion();
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            Map<String, String> condition = new HashMap<>();
@@ -148,8 +150,9 @@ public class CrawlerManager {
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
            adapterFlg = true;
        }
        return true;
        return adapterFlg;
    }
    /**
@@ -169,7 +172,7 @@ public class CrawlerManager {
        }
    }
    public void setVersion(String version) {
        this.version = version;
    public void setAdapterFlg(Boolean adapterFlg) {
        this.adapterFlg = adapterFlg;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDatasetController.java

@@ -18,10 +18,10 @@ import java.io.UnsupportedEncodingException;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDatasetController")
@RestController("AdapterDatasetController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
public class SchemeDatasetController extends BaseController {
@Api(protocols = "https", value = "AdapterDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
public class AdapterDatasetController extends BaseController {
    @Resource(name = AdapterDatasetService.BEAN_ID)
    private AdapterDatasetService datasetService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDictController.java

@@ -16,10 +16,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDictController")
@RestController("AdapterDictController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDictController", description = "适配字典管理", tags = {"适配字典"})
public class SchemeDictController extends BaseController {
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterDictController extends BaseController {
    @Resource(name = AdapterDictService.BEAN_ID)
    private AdapterDictService dictService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDictEntryController.java

@@ -16,10 +16,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDictEntryController")
@RestController("AdapterDictEntryController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
public class SchemeDictEntryController extends BaseController {
@Api(protocols = "https", value = "AdapterDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
public class AdapterDictEntryController extends BaseController {
    @Resource(name = AdapterDictEntryService.BEAN_ID)
    private AdapterDictEntryService dictentryService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeMetadataController.java

@@ -17,10 +17,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeMetadataController")
@RestController("AdapterMetadataController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeMetadataController", description = "适配字典管理", tags = {"适配字典"})
public class SchemeMetadataController extends BaseController {
@Api(protocols = "https", value = "AdapterMetadataController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterMetadataController extends BaseController {
    @Resource(name = AdapterMetadataService.BEAN_ID)
    private AdapterMetadataService metadataService;
    /**

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeVersionService.java

@@ -114,7 +114,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (versionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                    CrawlerManager.getInstance().setAdapterFlg(false);
                }
            }
        } catch (Exception e) {
@@ -230,7 +230,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (adapterSchemeVersionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                    CrawlerManager.getInstance().setAdapterFlg(false);
                }
            }
            adapterSchemeVersionModel.setPublishTime(new Date());
@@ -413,15 +413,15 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return sql.toString();
    }
    public String getEhrAdapterVersionLasted() {
    public AdapterSchemeVersionModel getEhrAdapterVersionLasted() {
        AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
        if (adapterSchemeModel == null) {
            return Constants.EMPTY;
            return null;
        }
        String adapterSchemeVersionHql = "SELECT VERSION FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        String adapterSchemeVersionHql = "SELECT ID AS id,VERSION AS version,SCHEME_ID AS schemeId,NAME AS name FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        Query adapterSchemeVersionQuery = getCurrentSession().createSQLQuery(adapterSchemeVersionHql);
        adapterSchemeVersionQuery.setParameter("schemeId", adapterSchemeModel.getId());
        String version = (String) adapterSchemeVersionQuery.uniqueResult();
        AdapterSchemeVersionModel version = (AdapterSchemeVersionModel) adapterSchemeVersionQuery.uniqueResult();
        return version;
    }

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardVersionService.java

@@ -120,7 +120,6 @@ public class StandardVersionService extends SQLGeneralDAO {
            Map<String, Object> query = new HashMap<>();
            Map<String, String> order = new HashMap<>();
            query.put("name", versionName);
            query.put("publishStatus", 1);
            List<StandardVersionModel> list = getList(standardId, query, order, 1, 0);
            if (!CollectionUtil.isEmpty(list)) {
                return true;