diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java index 7edc071..1cedf57 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java @@ -70,7 +70,7 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService { data.setCreateUserId(userId); data.setCreateTime(new Date()); tbCablewaTransMapper.addTbCablewaTrans(data); - return ServerResponse.createSuccess("索道运输-新增成功"); + return ServerResponse.createBySuccessMsg("索道运输-新增成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("索道运输-新增失败"); @@ -88,7 +88,7 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService { Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); tbCablewaTransMapper.updateTbCablewaTrans(data); - return ServerResponse.createSuccess("索道运输-修改成功"); + return ServerResponse.createBySuccessMsg("索道运输-修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("索道运输-修改失败"); @@ -104,7 +104,7 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService { public ServerResponse delTbCablewaTrans(TbCablewaTransVo data) { try { tbCablewaTransMapper.delTbCablewaTrans(data); - return ServerResponse.createSuccess("索道运输-修改成功"); + return ServerResponse.createBySuccessMsg("索道运输-修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("索道运输-修改失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index 5c011be..f3d7ae5 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo; +import com.bonus.digitalSignage.system.vo.LoginUser; import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.UserUtil; import com.bonus.digitalSignage.webResult.StringUtils; @@ -49,6 +50,7 @@ public class TbProjectServiceImpl implements TbProjectService { @Override public ServerResponse getTbProjectList(TbProjectVo data) { try { + LoginUser oginUser = UserUtil.getLoginUser(); //获取工程列表 List tbProjectVoList = tbProjectMapper.getTbProjectList(data); TbTowerVo tbTowerVo = new TbTowerVo(); @@ -111,7 +113,7 @@ public class TbProjectServiceImpl implements TbProjectService { Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); tbProjectMapper.updateTbProject(data); - return ServerResponse.createSuccess("线路工程管理-修改成功"); + return ServerResponse.createBySuccessMsg("线路工程管理-修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("线路工程管理-修改失败"); @@ -134,7 +136,7 @@ public class TbProjectServiceImpl implements TbProjectService { data.setCreateUserId(userId); data.setCreateTime(new Date()); tbProjectMapper.addTbProject(data); - return ServerResponse.createSuccess("线路工程管理-新增成功"); + return ServerResponse.createBySuccessMsg("线路工程管理-新增成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("线路工程管理-新增失败"); @@ -150,7 +152,7 @@ public class TbProjectServiceImpl implements TbProjectService { public ServerResponse delTbProject(TbProjectVo data) { try { tbProjectMapper.delTbProject(data); - return ServerResponse.createSuccess("线路工程管理-删除成功"); + return ServerResponse.createBySuccessMsg("线路工程管理-删除成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("线路工程管理-删除失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java index ed696f0..4242fd1 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java @@ -91,7 +91,7 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService { if (tbSpanTowerList.size()>0){ tbSpanTowerService.addTbSpanTowerList(data.getId(),tbSpanTowerList); } - return ServerResponse.createSuccess("三跨管理-新增成功"); + return ServerResponse.createBySuccessMsg("三跨管理-新增成功"); } catch (Throwable e) { log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); @@ -116,7 +116,7 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService { if (!tbSpanTowerList.isEmpty()){ tbSpanTowerService.updateTbSpanTower(tbSpanTowerList,data.getId()); } - return ServerResponse.createSuccess("三跨管理-修改成功"); + return ServerResponse.createBySuccessMsg("三跨管理-修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("三跨管理-修改失败"); @@ -137,7 +137,7 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService { if (!tbSpanTowerList.isEmpty()){ tbSpanTowerService.delTbSpanTower(data.getId()); } - return ServerResponse.createSuccess("三跨管理-删除成功"); + return ServerResponse.createBySuccessMsg("三跨管理-删除成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("三跨管理-删除失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java index a2381c6..97171ae 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java @@ -90,7 +90,7 @@ public class TbTowerServiceImpl implements TbTowerService { data.setCreateUserId(userId); data.setCreateTime(new Date()); tbTowerMapper.addTbTower(data); - return ServerResponse.createSuccess("杆塔管理-新增成功"); + return ServerResponse.createBySuccessMsg("杆塔管理-新增成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("杆塔管理-新增失败"); @@ -126,7 +126,7 @@ public class TbTowerServiceImpl implements TbTowerService { Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); tbTowerMapper.updateTbTower(data); - return ServerResponse.createSuccess("杆塔管理-修改成功"); + return ServerResponse.createBySuccessMsg("杆塔管理-修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("杆塔管理-修改失败"); @@ -142,7 +142,7 @@ public class TbTowerServiceImpl implements TbTowerService { public ServerResponse delTbTower(TbTowerVo data) { try { tbTowerMapper.delTbTower(data); - return ServerResponse.createSuccess("杆塔管理-删除成功"); + return ServerResponse.createBySuccessMsg("杆塔管理-删除成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("杆塔管理-删除失败");