Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/service/sync/BaseSyncDataService.java

@@ -11,12 +11,16 @@ import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
 * @author HZY
@@ -54,7 +58,7 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
//
//        return PageEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find,list,page,size,count);
//    }
        private static Logger logger = LoggerFactory.getLogger(BaseSyncDataService.class);
    /**
     * 根据时间查询
     * @param startTime
@@ -64,15 +68,19 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
    public PageEnvelop findAllSyncData(String startTime, String endTime,Integer page,Integer size) {
        StringBuffer sql= new StringBuffer("SELECT c.* FROM wlyy_data_sync c WHERE 1=1 ");
        StringBuffer sqlCount= new StringBuffer("SELECT COUNT(c.id) count FROM wlyy_data_sync c WHERE 1=1  ");
        if (StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime)){
            sql.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
            sqlCount.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
        }
        sql.append(" ORDER BY c.complete_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        sql.append(" ORDER BY c.create_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        List<BaseSyncDataDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(BaseSyncDataDO.class));
        long count =list.size();
        List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sqlCount.toString());
        long count = Long.parseLong(mapList.get(0).get("count").toString());
        return PageEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find,list,page,size,count);
    }
@@ -82,50 +90,110 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
     * 完成同步
     * @return
     */
    @Transactional(noRollbackFor=Exception.class)
    public void complete (String wxId) {
        logger.info("======================同步开始========================");
        BaseSyncDataDO syncDataDO = new BaseSyncDataDO();
        syncDataDO.setUpdateTime(DateUtil.getNowDate());
        syncDataDO.setStyle(1);
        try {
            syncDataDO.setSyncResult("进行中");
            //眼科中心
            if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                logger.info("======================眼科中心同步开始========================");
                String result = ykyyEntranceService.updateYkyyDept();
                if (result.equalsIgnoreCase("success")){
                    logger.info("======================同步科室信息成功========================");
                }else {
                    logger.info("======================同步科室信息失败========================");
                }
                String re = ykyyEntranceService.updateYkyyDoctor();
                if (re.equalsIgnoreCase("success")){
                    logger.info("======================同步医生信息成功========================");
                }else {
                    logger.info("======================同步医生信息失败========================");
                }
                if (result.equalsIgnoreCase("success")&&re.equalsIgnoreCase("success")){
                    syncDataDO.setSyncResult("同步成功");
                    logger.info("======================眼科中心同步成功========================");
                }else {
                    syncDataDO.setSyncResult("同步失败");
                    logger.info("======================眼科中心同步失败========================");
                }
                syncDataDO.setCompleteTime(DateUtil.getNowDate());
            }
            //心脏中心
            if ("xm_xzzx_wx".equalsIgnoreCase(wxId)){
                logger.info("======================眼科中心同步结束========================");
            }else if ("xm_xzzx_wx".equalsIgnoreCase(wxId)){
                logger.info("======================心脏中心同步开始========================");
                Integer doctorInfo = xzzxEntranceService.syncDoctorInfo();
                if (doctorInfo==200){
                    logger.info("======================同步医生信息成功========================");
                }else {
                    logger.info("======================同步医生信息失败========================");
                }
                Integer deptInfo = xzzxEntranceService.syncDeptInfo();
                if (deptInfo==200){
                    logger.info("======================同步部门信息成功========================");
                }else {
                    logger.info("======================同步部门信息失败========================");
                }
                Integer jobTitle = xzzxEntranceService.syncJobTitle();
                if (jobTitle==200){
                    logger.info("======================同步职称信息成功========================");
                }else {
                    logger.info("======================同步职称信息失败========================");
                }
                Integer chargeDict = xzzxEntranceService.syncChargeDict();
                if (chargeDict==200){
                    logger.info("======================同步号别信息成功========================");
                }else {
                    logger.info("======================同步号别信息失败========================");
                }
                if (deptInfo==200&&doctorInfo==200&&jobTitle==200&&chargeDict==200){
                    syncDataDO.setSyncResult("同步成功");
                    logger.info("======================心脏中心同步成功========================");
                }else {
                    syncDataDO.setSyncResult("同步失败");
                    logger.info("======================心脏中心同步失败========================");
                }
                syncDataDO.setCompleteTime(DateUtil.getNowDate());
            }
            if("xm_zsyy_wx".equalsIgnoreCase(wxId)){
                logger.info("======================心脏中心同步结束========================");
            } else if("xm_zsyy_wx".equalsIgnoreCase(wxId)){
                logger.info("======================中山医院信息同步开始========================");
                Integer syncMS02003 = entranceService.syncMS02003();
                if (syncMS02003==200){
                    logger.info("======================同步医生信息成功========================");
                }else {
                    logger.info("======================同步医生信息失败========================");
                }
                Integer syncBS16010 = entranceService.syncBS16010();
                if (syncBS16010==200){
                    logger.info("======================同步医生简介信息成功========================");
                }else {
                    logger.info("======================同步医生简介信息失败========================");
                }
                Integer syncBS16011 = entranceService.syncBS16011();
                if (syncBS16011==200){
                    logger.info("======================同步科室简介信息成功========================");
                }else {
                    logger.info("======================同步科室简介信息失败========================");
                }
                Integer integer1 = entranceService.syncDoctorInfo();
                if (syncMS02003==200&&syncBS16010==200&&syncBS16011==200&&integer1==200){
                    syncDataDO.setSyncResult("同步成功");
                    logger.info("======================中山医院信息同步成功========================");
                }else {
                    syncDataDO.setSyncResult("同步失败");
                    logger.info("======================中山医院信息同步失败========================");
                }
                syncDataDO.setCompleteTime(DateUtil.getNowDate());
                logger.info("======================中山医院信息同步结束========================");
            }else {
                syncDataDO.setSyncResult("同步失败");
                syncDataDO.setCompleteTime(DateUtil.getNowDate());
                logger.info("======================同步信息失败========================");
            }
        } catch (Exception e) {
@@ -135,6 +203,7 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
        }
        syncDataDO.setCreateUserName(userAgent.getUNAME());
        baseSyncDataDao.save(syncDataDO);
        logger.info("======================同步结束========================");
    }
}