diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 445963a8a..d6c9e4e28 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -562,17 +562,17 @@ public class HeartService { */ @Transactional(propagation = Propagation.NESTED) public void insertBasicData(String content) { - Dict map = JsonUtils.parseMap(content); - List hospTypeList = (List) map.get(BasicHospTypeEntity.class.getSimpleName()); - List udiRelevanceList = (List) map.get(UdiRelevanceEntity.class.getSimpleName()); - List productsList = (List) map.get(BasicProductsEntity.class.getSimpleName()); - List relevanceList = (List) map.get(CompanyProductRelevanceEntity.class.getSimpleName()); - List corpList = (List) map.get(BasicCorpEntity.class.getSimpleName()); - List supCertList = (List) map.get(SupCertEntity.class.getSimpleName()); - List supCertSetList = (List) map.get(SupCertSetEntity.class.getSimpleName()); - List supCompanyList = (List) map.get(SupCompanyEntity.class.getSimpleName()); - List supManufacturerList = (List) map.get(SupManufacturerEntity.class.getSimpleName()); - List supProductList = (List) map.get(SupProductEntity.class.getSimpleName()); + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); + List hospTypeList = JSONUtil.toList(jsonObject.getJSONArray(BasicHospTypeEntity.class.getSimpleName()), BasicHospTypeEntity.class); + List udiRelevanceList = JSONUtil.toList(jsonObject.getJSONArray(UdiRelevanceEntity.class.getSimpleName()), UdiRelevanceEntity.class); + List productsList = JSONUtil.toList(jsonObject.getJSONArray(BasicProductsEntity.class.getSimpleName()), BasicProductsEntity.class); + List relevanceList = JSONUtil.toList(jsonObject.getJSONArray(CompanyProductRelevanceEntity.class.getSimpleName()), CompanyProductRelevanceEntity.class); + List corpList = JSONUtil.toList(jsonObject.getJSONArray(BasicCorpEntity.class.getSimpleName()), BasicCorpEntity.class); + List supCertList = JSONUtil.toList(jsonObject.getJSONArray(SupCertEntity.class.getSimpleName()), SupCertEntity.class); + List supCertSetList = JSONUtil.toList(jsonObject.getJSONArray(SupCertSetEntity.class.getSimpleName()), SupCertSetEntity.class); + List supCompanyList = JSONUtil.toList(jsonObject.getJSONArray(SupCompanyEntity.class.getSimpleName()), SupCompanyEntity.class); + List supManufacturerList = JSONUtil.toList(jsonObject.getJSONArray(SupManufacturerEntity.class.getSimpleName()), SupManufacturerEntity.class); + List supProductList = JSONUtil.toList(jsonObject.getJSONArray(SupProductEntity.class.getSimpleName()), SupProductEntity.class); if (CollectionUtil.isNotEmpty(hospTypeList)) { basicHospTypeDao.insertOrUpdateBatch(hospTypeList); @@ -617,9 +617,9 @@ public class HeartService { */ @Transactional(propagation = Propagation.NESTED) public void insertOtherData(String content) { - Dict map = JsonUtils.parseMap(content); - List ioCodeLostList = (List) map.get(IoCodeLostEntity.class.getSimpleName()); - List ioCodeRelList = (List) map.get(IoCodeRelEntity.class.getSimpleName()); + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); + List ioCodeLostList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeLostEntity.class.getSimpleName()), IoCodeLostEntity.class); + List ioCodeRelList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeRelEntity.class.getSimpleName()), IoCodeRelEntity.class); if (CollectionUtil.isNotEmpty(ioCodeLostList)) { ioCodeLostMapper.insertOrUpdateBatch(ioCodeLostList); } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 3a88ab8b2..ee55b14fc 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -20,8 +20,8 @@ import javax.annotation.Resource; import java.util.Arrays; -//@Component -//@EnableScheduling +@Component +@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);