Merge remote-tracking branch 'origin/master'
# Conflicts: # api-admin/target/classes/application-dev.properties # api-admin/target/classes/com/glxp/udidl/admin/config/GlobalConfig.class # api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class # api-admin/target/classes/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.classmaster
anthonywj
3 years ago
commit
94a8464ca7
@ -0,0 +1,10 @@
|
||||
package com.glxp.udidl.admin.res.udplat;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdplatResponse<T> {
|
||||
private Boolean success;
|
||||
private String message;
|
||||
private UdplatResponseData<T> data;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.udidl.admin.res.udplat;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UdplatResponseData<T> {
|
||||
private int page;
|
||||
private int pageSize;
|
||||
private int total;
|
||||
private List<T> data;
|
||||
}
|
||||
@ -0,0 +1,144 @@
|
||||
package com.glxp.udidl.admin.service.DataSync;
|
||||
|
||||
import com.glxp.udidl.admin.dto.udplat.UdplatDistributorModel;
|
||||
import com.glxp.udidl.admin.dto.udplat.UdplatGoodsModel;
|
||||
import com.glxp.udidl.admin.dto.udplat.UdplatHospitalModel;
|
||||
import com.glxp.udidl.admin.dto.udplat.UdplatManufactureModel;
|
||||
import com.glxp.udidl.admin.entity.udplat.UdplatLog;
|
||||
import com.glxp.udidl.admin.service.udplat.*;
|
||||
import com.glxp.udidl.admin.util.DateUtil;
|
||||
import com.glxp.udidl.common.res.BaseResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class UdplatSyncService {
|
||||
@Autowired
|
||||
private UdplatDownloadService downloadService;
|
||||
@Autowired
|
||||
private UdplatLogService logService;
|
||||
@Autowired
|
||||
private UdplatManufactureService manufactureService;
|
||||
@Autowired
|
||||
private UdplatDistributorService distributorService;
|
||||
@Autowired
|
||||
private UdplatHospitalService hospitalService;
|
||||
@Autowired
|
||||
private UdplatGoodsService goodsService;
|
||||
@Async
|
||||
public void downloadAndSave(String downloadType,String tbName) {
|
||||
log.info("tbName:"+tbName);
|
||||
if (tbName == null || tbName == "" || tbName.equals("udplat_manufacture"))
|
||||
SyncManufacture(downloadType);
|
||||
if (tbName == null || tbName == "" || tbName.equals("udplat_distributor"))
|
||||
SyncDistributor(downloadType);
|
||||
if (tbName == null || tbName == "" || tbName.equals("udplat_hospital"))
|
||||
SyncHospitals(downloadType);
|
||||
if (tbName == null || tbName == "" || tbName.equals("udplat_goods"))
|
||||
SyncUdplatGoods(downloadType, null, null);
|
||||
}
|
||||
|
||||
public void downloadByDay(String downloadType){
|
||||
SyncManufacture(downloadType);
|
||||
SyncDistributor(downloadType);
|
||||
SyncHospitals(downloadType);
|
||||
String starTime=DateUtil.getYesterday();
|
||||
String endTime=DateUtil.getLastDay(1);
|
||||
SyncUdplatGoods(downloadType,starTime,endTime);
|
||||
}
|
||||
/**
|
||||
* 同步生产企业
|
||||
* @param downloadType
|
||||
*/
|
||||
private void SyncManufacture(String downloadType){
|
||||
BaseResponse response = downloadService.getAllManufactures();
|
||||
if(response.getCode() != 20000)
|
||||
{
|
||||
UdplatLog udplatLog = new UdplatLog();
|
||||
udplatLog.setDownloadType(downloadType);
|
||||
udplatLog.setTbName("udplat_manufacture");
|
||||
udplatLog.setType("error");
|
||||
udplatLog.setMsg(response.getMessage());
|
||||
udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
|
||||
udplatLog.setCreateTime(new Date());
|
||||
logService.insert(udplatLog);
|
||||
return;
|
||||
}
|
||||
List<UdplatManufactureModel> list = (List<UdplatManufactureModel>)response.getData();
|
||||
manufactureService.save(list,downloadType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步配送企业
|
||||
* @param downloadType
|
||||
*/
|
||||
private void SyncDistributor(String downloadType){
|
||||
BaseResponse response = downloadService.getAllDistributors();
|
||||
if(response.getCode() != 20000)
|
||||
{
|
||||
UdplatLog udplatLog = new UdplatLog();
|
||||
udplatLog.setDownloadType(downloadType);
|
||||
udplatLog.setTbName("udplat_distributor");
|
||||
udplatLog.setType("error");
|
||||
udplatLog.setMsg(response.getMessage());
|
||||
udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
|
||||
udplatLog.setCreateTime(new Date());
|
||||
logService.insert(udplatLog);
|
||||
return;
|
||||
}
|
||||
List<UdplatDistributorModel> list = (List<UdplatDistributorModel>)response.getData();
|
||||
distributorService.save(list,downloadType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步医疗机构清单
|
||||
* @param downloadType
|
||||
*/
|
||||
private void SyncHospitals(String downloadType){
|
||||
BaseResponse response = downloadService.getAllHospitals();
|
||||
if(response.getCode() != 20000)
|
||||
{
|
||||
UdplatLog udplatLog = new UdplatLog();
|
||||
udplatLog.setDownloadType(downloadType);
|
||||
udplatLog.setTbName("udplat_hospital");
|
||||
udplatLog.setType("error");
|
||||
udplatLog.setMsg(response.getMessage());
|
||||
udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
|
||||
udplatLog.setCreateTime(new Date());
|
||||
logService.insert(udplatLog);
|
||||
return;
|
||||
}
|
||||
List<UdplatHospitalModel> list = (List<UdplatHospitalModel>)response.getData();
|
||||
hospitalService.save(list,downloadType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步可选目录
|
||||
* @param downloadType
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
*/
|
||||
public void SyncUdplatGoods(String downloadType,String startTime,String endTime){
|
||||
BaseResponse response = downloadService.getAllUdplatGoods(startTime,endTime);
|
||||
if(response.getCode() != 20000)
|
||||
{
|
||||
UdplatLog udplatLog = new UdplatLog();
|
||||
udplatLog.setDownloadType(downloadType);
|
||||
udplatLog.setTbName("udplat_goods");
|
||||
udplatLog.setType("error");
|
||||
udplatLog.setMsg(response.getMessage());
|
||||
udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
|
||||
udplatLog.setCreateTime(new Date());
|
||||
logService.insert(udplatLog);
|
||||
return;
|
||||
}
|
||||
List<UdplatGoodsModel> list = (List<UdplatGoodsModel>)response.getData();
|
||||
goodsService.save(list,downloadType);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.glxp.udidl.admin.thread;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.glxp.udidl.admin.dao.info.ScheduledDao;
|
||||
import com.glxp.udidl.admin.entity.info.ScheduledEntity;
|
||||
import com.glxp.udidl.admin.entity.udplat.UdplatLog;
|
||||
import com.glxp.udidl.admin.req.info.ScheduledRequest;
|
||||
import com.glxp.udidl.admin.service.DataSync.UdplatSyncService;
|
||||
import com.glxp.udidl.admin.service.udplat.UdplatLogService;
|
||||
import com.glxp.udidl.admin.util.DateUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.scheduling.annotation.SchedulingConfigurer;
|
||||
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
||||
import org.springframework.scheduling.support.CronTrigger;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
|
||||
@Component
|
||||
@EnableScheduling
|
||||
@Slf4j
|
||||
public class DownloadTaskUdplat implements SchedulingConfigurer {
|
||||
@Resource
|
||||
private ScheduledDao scheduledDao;
|
||||
@Autowired
|
||||
UdplatSyncService udplatSyncService;
|
||||
@Autowired
|
||||
private UdplatLogService logService; //日志
|
||||
@Override
|
||||
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
|
||||
scheduledTaskRegistrar.addTriggerTask(() -> process(),
|
||||
triggerContext -> {
|
||||
ScheduledRequest scheduledRequest = new ScheduledRequest();
|
||||
scheduledRequest.setCronName("downloadTaskUdplat");
|
||||
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
|
||||
String cron = scheduledEntity.getCron();
|
||||
if (cron.isEmpty()) {
|
||||
log.error("cron is null");
|
||||
}
|
||||
return new CronTrigger(cron).nextExecutionTime(triggerContext);
|
||||
});
|
||||
}
|
||||
private void process(){
|
||||
try {
|
||||
udplatSyncService.downloadByDay("auto");
|
||||
}catch (Exception e){
|
||||
UdplatLog udplatLog = new UdplatLog();
|
||||
udplatLog.setDownloadType("auto");
|
||||
//udplatLog.setTbName("");
|
||||
udplatLog.setType("error");
|
||||
udplatLog.setMsg(e.getMessage());
|
||||
udplatLog.setContent(JSON.toJSONString(e.getStackTrace()));
|
||||
udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
|
||||
udplatLog.setCreateTime(new Date());
|
||||
logService.insert(udplatLog);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
# 本地环境
|
||||
server.port=9994
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udidl?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||
spring.datasource.username=root
|
||||
#spring.datasource.password=mysql@2020
|
||||
spring.datasource.password=123456
|
||||
server.servlet.context-path=
|
||||
logging.level.com.glxp.udidl.admin.dao=debug
|
||||
# 跨域设置
|
||||
cors.allowed-origins=*
|
||||
cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN
|
||||
cors.allowed-methods=GET,POST,OPTIONS
|
||||
#mips服务地址
|
||||
UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server
|
||||
#UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:9997
|
||||
config.downloadPath=E:/temp
|
||||
config.openAuth=false
|
||||
spring.servlet.multipart.max-file-size=100MB
|
||||
spring.servlet.multipart.max-request-size=1000MB
|
||||
# 阳光采购平台
|
||||
udplat.host=http://pre-mcs.udplat.org/mcs-api
|
||||
#udplat.appId=10000090
|
||||
#udplat.secretKey=QchvZnPYK1jyOYV
|
||||
#udplat.userName=\u8bcf\u5b89\u53bf\u533b\u9662
|
||||
|
||||
udplat.appId=20004072
|
||||
udplat.secretKey=hoGxLSEsSyysnS9
|
||||
udplat.userName=\u798F\u5EFA\u7247\u4ED4\u7640\u8BCA\u65AD\u6280\u672F\u6709\u9650\u516C\u53F8
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue