hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai

This commit is contained in:
xiang2lin 2024-05-16 10:13:09 +08:00
parent 1dec709122 72ca970078
commit e7127e581e
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTask
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService;
import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity;
import com.hzya.frame.uuid.UUIDLong;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.web.exception.BaseSystemException;
@ -32,7 +33,7 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
}
/**
*
* @content 完全用于测试，此接口不使用
* @content 完全用于测试，此接口不使用1
* @author laborer
* @date 2024/5/15 0015 16:00
*
@ -66,7 +67,10 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
*/
@Override
public JsonResultEntity saveLogToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
entity.setId(String.valueOf(UUIDLong.longUUID()));
checkDate(entity);
entity.setNewState("Y");
entity.setRepairPust("N");
try {
entity = integrationTaskLivingDetailsDao.saveSuccessLog(entity);
return BaseResult.getSuccessMessageEntity(entity);
@ -87,8 +91,11 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
*/
@Override
public JsonResultEntity saveLogToFail(IntegrationTaskLivingDetailsEntity entity)throws Exception {
entity.setId(String.valueOf(UUIDLong.longUUID()));
//验证必填字段如果不满足返回数据
checkDate(entity);
entity.setNewState("N");
entity.setRepairPust("Y");
try {
entity = integrationTaskLivingDetailsDao.save(entity);
return BaseResult.getSuccessMessageEntity(entity);
@ -108,6 +115,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
public JsonResultEntity saveLogFailToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
//验证必填字段如果不满足返回数据
checkDate(entity);
entity.setNewState("Y");
entity.setRepairPust("N");
try {
//先根据主键删除错误日志表数据，在进行成功表写入
integrationTaskLivingDetailsDao.delete(entity.getId());
@ -130,6 +139,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
public JsonResultEntity updateLogFailToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
//验证必填字段如果不满足返回数据
checkDate(entity);
entity.setNewState("N");
entity.setRepairPust("Y");
try {
//将数据写入成功日志表
entity = integrationTaskLivingDetailsDao.update(entity);
@ -174,14 +185,14 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
if (StrUtil.isEmpty(newTransmitInfo)) {
throw new BaseSystemException("三方系统返回数据不可为空，请传入");
}
String repairPust = entity.getRepairPust();//是否补推(Y是N不是) 成功情况下默认N不需要补退
if (StrUtil.isEmpty(repairPust)) {
throw new BaseSystemException("是否补推不可为空，请传入");
}
String newState = entity.getNewState();//推送状态 成功情况下默认Y
if (StrUtil.isEmpty(newState)) {
throw new BaseSystemException("推送状态不可为空，请传入");
}
// String repairPust = entity.getRepairPust();//是否补推(Y是N不是) 成功情况下默认N不需要补退
// if (StrUtil.isEmpty(repairPust)) {
// throw new BaseSystemException("是否补推不可为空，请传入");
// }
// String newState = entity.getNewState();//推送状态 成功情况下默认Y
// if (StrUtil.isEmpty(newState)) {
// throw new BaseSystemException("推送状态不可为空，请传入");
// }
}
}