diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java index e8f81ecb4..0a08b6692 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java @@ -67,6 +67,6 @@ public interface IExpImportQueryService * @param expressInfoList Excel导入的快递列表 * @return 结果 */ - public AjaxResult importData(List expressInfoList); + public AjaxResult importData(List expressInfoList) throws Exception; } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java index c3f4e28a7..813c66b4c 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; @@ -92,13 +93,15 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService * @return 结果 */ @Override + @Transactional public int deleteExpImportQueryByIds(String ids) { for(String str:Arrays.asList(ids.split(","))) { expressInfoMapper.deleteExpressInfoByQueryId(str); } - return expImportQueryMapper.deleteExpImportQueryByIds(Convert.toStrArray(ids)); + int message= expImportQueryMapper.deleteExpImportQueryByIds(Convert.toStrArray(ids)); + return message; } /** @@ -115,18 +118,19 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService /** - * 删除Excel批量快递查询信息 + * Excel批量快递查询信息 * * @param expressInfoList Excel导入的快递列表 * @return 结果 */ @Override - public AjaxResult importData(List expressInfoList) { + @Transactional + public AjaxResult importData(List expressInfoList) throws Exception { String queryTime= DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"); String queryId= LocalDateTime.now().toString(); ExpImportQuery expImportQuery=new ExpImportQuery(); List expressInfoListForInsert=new ArrayList<>(); - try{ + /* try{*/ //将查询到的快递结果放到expressInfoListForInsert,并插入到数据库表expressInfo for( ExpressInfo expressInfo:expressInfoList){ ExpressInfo ei= expressInfoService.SelectExpressInfo(expressInfo); @@ -158,12 +162,13 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService expImportQuery.setStatus("success"); expImportQuery.setQueryQty(String.valueOf(expressInfoList.size())); expImportQuery.setQueryId(queryId); - expImportQueryMapper.insertExpImportQuery(expImportQuery); + int message=expImportQueryMapper.insertExpImportQuery(expImportQuery); + return AjaxResult.success(message); - return AjaxResult.success("导入查询成功!"); - }catch (Exception e){ + + /*}catch (Exception e){ expImportQuery.setStatus("fail"); return AjaxResult.error(e.getMessage()); - } + }*/ } }