|
|
@ -51,6 +51,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; |
|
|
|
import com.epmet.dataaggre.dto.epmettduck.struct.*; |
|
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; |
|
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; |
|
|
|
import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; |
|
|
|
import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; |
|
|
|
import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; |
|
|
|
import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; |
|
|
@ -70,6 +71,8 @@ import org.springframework.util.CollectionUtils; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.Executors; |
|
|
|
import java.util.concurrent.Future; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
@ -251,9 +254,37 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, |
|
|
|
} |
|
|
|
r.setOrgName(orgName); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
insertPrVistRecord(formDTO) |
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* desc:一步插入访问记录 不带projectKey |
|
|
|
* @param formDTO |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private Future<?> insertPrVistRecord(TDuckListFormDTO formDTO) { |
|
|
|
return Executors.newCachedThreadPool().submit(()->{ |
|
|
|
PrVistRecordDTO param = new PrVistRecordDTO(); |
|
|
|
param.setCustomerId(formDTO.getCustomerId()); |
|
|
|
param.setUserId(formDTO.getUserId()); |
|
|
|
param.setUserType(formDTO.getOrgType()); |
|
|
|
param.setProjectKey(formDTO.getClient()); |
|
|
|
PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId()); |
|
|
|
PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class); |
|
|
|
if (newestRecord == null) { |
|
|
|
prVistRecordService.insert(entity); |
|
|
|
} else { |
|
|
|
entity = new PrVistRecordEntity(); |
|
|
|
entity.setId(newestRecord.getId()); |
|
|
|
prVistRecordService.updateById(entity); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description orgIds拼接 |
|
|
|
* @Param pids |
|
|
@ -808,4 +839,4 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, |
|
|
|
query.eq(PrUserProjectEntity::getKey, key); |
|
|
|
return baseDao.selectOne(query); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|