From 4cf88a9338334df541a4a0bcacec2804c87712d4 Mon Sep 17 00:00:00 2001 From: lihua <531456470@qq.com> Date: Mon, 9 Sep 2019 18:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialController.java | 15 ++++++++++----- .../controller/StaffAssetController.java | 7 +++---- .../assetmanage/mapper/AmStaffAssetMapper.java | 2 ++ .../assetmanage/service/StaffAssetService.java | 2 +- .../service/impl/MaterialServiceImpl.java | 5 ++++- .../service/impl/StaffAssetServiceImpl.java | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java b/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java index e25edc8..039a046 100644 --- a/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java +++ b/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java @@ -93,12 +93,17 @@ public class MaterialController { if(list == null || list.isEmpty()){ return Result.error(ResponseCode.EXCEL_PARSE_ERROR); } - boolean ret; - if(isOverride != null && isOverride){ - ret = materialService.batchAdd(list,true); - }else{ - ret = materialService.batchAdd(list,false); + boolean ret = false; + try { + if(isOverride != null && isOverride){ + ret = materialService.batchAdd(list,true); + }else{ + ret = materialService.batchAdd(list,false); + } + }catch (RuntimeException e){ + e.printStackTrace(); } + if(!ret){ materialLogService.batchWriteLog(buildBatchLog(user.getId(),Constants.Operate.IN, Constants.Status.FAILED,list,getBatch(file))); return Result.error(ResponseCode.ASSET_BATCH_ADD_FAIL); diff --git a/src/main/java/cn/redrock/assetmanage/controller/StaffAssetController.java b/src/main/java/cn/redrock/assetmanage/controller/StaffAssetController.java index 758fcf9..aa6f704 100644 --- a/src/main/java/cn/redrock/assetmanage/controller/StaffAssetController.java +++ b/src/main/java/cn/redrock/assetmanage/controller/StaffAssetController.java @@ -41,10 +41,9 @@ public class StaffAssetController { return Result.ok(); } - @PostMapping("/edit") - public Result editAsset(@CurrentUser AmUser user,@Valid @RequestBody Asset asset) { - asset.setUserId(user.getId()); - if(!staffAssetService.update(asset)){ + @PostMapping("/edit/{id}") + public Result editAsset(@PathVariable("id") Integer id,@Valid @RequestBody Asset asset) { + if(!staffAssetService.update(id,asset)){ return Result.error(ResponseCode.ASSET_NO_EXISTED); } return Result.ok(); diff --git a/src/main/java/cn/redrock/assetmanage/mapper/AmStaffAssetMapper.java b/src/main/java/cn/redrock/assetmanage/mapper/AmStaffAssetMapper.java index 98107db..b401831 100644 --- a/src/main/java/cn/redrock/assetmanage/mapper/AmStaffAssetMapper.java +++ b/src/main/java/cn/redrock/assetmanage/mapper/AmStaffAssetMapper.java @@ -13,4 +13,6 @@ public interface AmStaffAssetMapper extends Mapper { @Select(value = "select a.*,b.nickname user_name from am_staff_asset a,am_user b where a.user_id=#{userId} and a.name=#{name} and a.user_id=b.id") AmStaffAsset find(@Param("userId") Integer userId, @Param("name") String name); + @Select(value = "select * from am_staff_asset where id=#{id}") + AmStaffAsset findById(Integer id); } \ No newline at end of file diff --git a/src/main/java/cn/redrock/assetmanage/service/StaffAssetService.java b/src/main/java/cn/redrock/assetmanage/service/StaffAssetService.java index fbbd5a4..27398dc 100644 --- a/src/main/java/cn/redrock/assetmanage/service/StaffAssetService.java +++ b/src/main/java/cn/redrock/assetmanage/service/StaffAssetService.java @@ -15,6 +15,6 @@ import java.util.List; public interface StaffAssetService { boolean add(Asset asset); List search(Integer userId,String field, String content, Integer pageNum, Integer pageSize); - boolean update(Asset asset); + boolean update(Integer id,Asset asset); boolean delete(Integer id); } diff --git a/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java b/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java index 34e19ea..3223a13 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java @@ -75,6 +75,7 @@ public class MaterialServiceImpl implements MaterialService { log.info("update add material success from {} to {} ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); }else{ log.error("update add material failed from {} to {} ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); + throw new RuntimeException("update add material failed"); } }else{ BeanUtils.copyProperties(material,newMaterial); @@ -83,10 +84,12 @@ public class MaterialServiceImpl implements MaterialService { log.info("add material success {}", JSON.toJSONString(newMaterial)); }else{ log.error("add material failed {}", JSON.toJSONString(newMaterial)); + throw new RuntimeException("add material failed"); } } }else{ - return false; + log.error("add material failed {}", JSON.toJSONString(material)); + throw new RuntimeException("add material failed"); } } return true; diff --git a/src/main/java/cn/redrock/assetmanage/service/impl/StaffAssetServiceImpl.java b/src/main/java/cn/redrock/assetmanage/service/impl/StaffAssetServiceImpl.java index 07bc010..fd37b17 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/StaffAssetServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/StaffAssetServiceImpl.java @@ -55,8 +55,8 @@ public class StaffAssetServiceImpl implements StaffAssetService { } @Override - public boolean update(Asset asset) { - AmStaffAsset staffAsset = staffAssetMapper.find(asset.getUserId(),asset.getName()); + public boolean update(Integer id,Asset asset) { + AmStaffAsset staffAsset = staffAssetMapper.findById(id); if(staffAsset == null){ log.info("public asset {} not exists",asset.getName()); return false;