From 8456d406cb7b4f0beb83ac7a356e603a45d83eeb Mon Sep 17 00:00:00 2001 From: lihua <531456470@qq.com> Date: Tue, 13 Aug 2019 14:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4bug?= =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E5=85=B6=E4=BB=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redrock/assetmanage/common/Constants.java | 2 +- .../controller/MaterialController.java | 6 ++--- .../controller/PublicAssetController.java | 6 ++--- .../controller/UserController.java | 1 + .../cn/redrock/assetmanage/dto/Material.java | 4 ++-- .../assetmanage/service/MaterialService.java | 2 +- .../service/PublicAssetService.java | 2 +- .../service/impl/MaterialServiceImpl.java | 23 +++++-------------- .../service/impl/PublicAssetServiceImpl.java | 4 ++-- .../service/impl/TokenServiceImpl.java | 10 +++++--- .../service/impl/UserServiceImpl.java | 7 +----- .../redrock/assetmanage/utils/ExcelUtils.java | 4 ++-- 12 files changed, 30 insertions(+), 41 deletions(-) diff --git a/src/main/java/cn/redrock/assetmanage/common/Constants.java b/src/main/java/cn/redrock/assetmanage/common/Constants.java index 1363f77..5984f3d 100644 --- a/src/main/java/cn/redrock/assetmanage/common/Constants.java +++ b/src/main/java/cn/redrock/assetmanage/common/Constants.java @@ -13,7 +13,7 @@ public class Constants { public static enum Status { FAILED(-1), NO_AUDIT(0), - SUCCESS(2); + SUCCESS(1); @Getter private Integer status; diff --git a/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java b/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java index 916b37c..16e0cf4 100644 --- a/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java +++ b/src/main/java/cn/redrock/assetmanage/controller/MaterialController.java @@ -163,9 +163,9 @@ public class MaterialController { } @Admin - @DeleteMapping("/delete/{code}") - public Result deleteMaterial(@PathVariable("code") String code) { - if(!materialService.delete(code)){ + @DeleteMapping("/delete/{id}") + public Result deleteMaterial(@PathVariable("id") Integer id) { + if(!materialService.delete(id)){ return Result.error(ResponseCode.ASSET_NO_EXISTED); } return Result.ok(); diff --git a/src/main/java/cn/redrock/assetmanage/controller/PublicAssetController.java b/src/main/java/cn/redrock/assetmanage/controller/PublicAssetController.java index 5a4b795..a61b60c 100644 --- a/src/main/java/cn/redrock/assetmanage/controller/PublicAssetController.java +++ b/src/main/java/cn/redrock/assetmanage/controller/PublicAssetController.java @@ -45,9 +45,9 @@ public class PublicAssetController { return Result.ok(); } - @DeleteMapping("/delete/{code}") - public Result deleteAsset(@PathVariable("code") String code) { - if(!publicAssetService.delete(code)){ + @DeleteMapping("/delete/{id}") + public Result deleteAsset(@PathVariable("id") Integer id) { + if(!publicAssetService.delete(id)){ return Result.error(ResponseCode.ASSET_NO_EXISTED); } return Result.ok(); diff --git a/src/main/java/cn/redrock/assetmanage/controller/UserController.java b/src/main/java/cn/redrock/assetmanage/controller/UserController.java index e837eb1..dd565c9 100644 --- a/src/main/java/cn/redrock/assetmanage/controller/UserController.java +++ b/src/main/java/cn/redrock/assetmanage/controller/UserController.java @@ -101,6 +101,7 @@ public class UserController { public Result edit(@CurrentUser AmUser user,Integer userId, @RequestBody UserInfo userInfo) { if(userId == null){ userId = user.getId(); + userInfo.setIsAdmin(user.getIsAdmin()); } if(!userService.editUser(userId,userInfo)){ return Result.error(ResponseCode.USER_EXISTED); diff --git a/src/main/java/cn/redrock/assetmanage/dto/Material.java b/src/main/java/cn/redrock/assetmanage/dto/Material.java index b0f175a..e88ee9e 100644 --- a/src/main/java/cn/redrock/assetmanage/dto/Material.java +++ b/src/main/java/cn/redrock/assetmanage/dto/Material.java @@ -16,12 +16,12 @@ import javax.validation.constraints.NotNull; @Data public class Material { private Integer id; - @ExcelColumn(value = "物料编号", col = 1) + @ExcelColumn(value = "物料编号", col = 1) @NotBlank private String code; - @ExcelColumn(value = "数量", col = 2) + @ExcelColumn(value = "数量", col = 2) @NotNull private Integer num; diff --git a/src/main/java/cn/redrock/assetmanage/service/MaterialService.java b/src/main/java/cn/redrock/assetmanage/service/MaterialService.java index 8fcda01..0e82575 100644 --- a/src/main/java/cn/redrock/assetmanage/service/MaterialService.java +++ b/src/main/java/cn/redrock/assetmanage/service/MaterialService.java @@ -20,6 +20,6 @@ public interface MaterialService { void batchSub(List materials,List successMaterials,List failMaterials); List search(String field, String content, Integer pageNum, Integer pageSize); boolean update(Material material); - boolean delete(String code); + boolean delete(Integer id); PageInfo warn(Integer pageNum, Integer pageSize); } diff --git a/src/main/java/cn/redrock/assetmanage/service/PublicAssetService.java b/src/main/java/cn/redrock/assetmanage/service/PublicAssetService.java index 48c6875..945fe1a 100644 --- a/src/main/java/cn/redrock/assetmanage/service/PublicAssetService.java +++ b/src/main/java/cn/redrock/assetmanage/service/PublicAssetService.java @@ -16,5 +16,5 @@ public interface PublicAssetService { boolean add(PublicAsset publicAsset); List search(String field, String content, Integer pageNum, Integer pageSize); boolean update(PublicAsset publicAsset); - boolean delete(String code); + 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 14db800..42996de 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/MaterialServiceImpl.java @@ -70,7 +70,7 @@ public class MaterialServiceImpl implements MaterialService { newMaterial.setCode(material.getCode()); newMaterial.setNum(num + material.getNum()); } - newMaterial.setUpdateTime(new Date()); + newMaterial.setId(oldMaterial.getId()); if(materialMapper.updateByPrimaryKeySelective(newMaterial) > 0){ log.info("update add material success from {} to {} ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); }else{ @@ -133,23 +133,12 @@ public class MaterialServiceImpl implements MaterialService { log.error("update sub material failed from {} to {} ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); } }else{ - newMaterial.setId(oldMaterial.getId()); - newMaterial.setCode(material.getCode()); - newMaterial.setNum(0); - if(materialMapper.updateByPrimaryKeySelective(newMaterial) > 0){ - log.info("update add material success from {} to {} for failed ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); - }else{ - log.error("update add material failed from {} to {} for failed ", JSON.toJSONString(oldMaterial),JSON.toJSONString(newMaterial)); - } BeanUtils.copyProperties(oldMaterial,errorMaterial); - errorMaterial.setNum(material.getNum() - num); - errorMaterial.setId(material.getId()); failMaterials.add(errorMaterial); } }else{ - errorMaterial.setId(material.getId()); errorMaterial.setCode(material.getCode()); - errorMaterial.setNum(material.getNum()); + errorMaterial.setNum(-1); failMaterials.add(errorMaterial); } } @@ -182,12 +171,12 @@ public class MaterialServiceImpl implements MaterialService { } @Override - public boolean delete(String code) { - if(materialMapper.deleteByPrimaryKey(code) > 0){ - log.info("delete material success {} ", code); + public boolean delete(Integer id) { + if(materialMapper.deleteByPrimaryKey(id) > 0){ + log.info("delete material success {} ", id); return true; } - log.error("delete material failed {} ", code); + log.error("delete material failed {} ", id); return false; } diff --git a/src/main/java/cn/redrock/assetmanage/service/impl/PublicAssetServiceImpl.java b/src/main/java/cn/redrock/assetmanage/service/impl/PublicAssetServiceImpl.java index d9eefe0..c8a55a1 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/PublicAssetServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/PublicAssetServiceImpl.java @@ -66,7 +66,7 @@ public class PublicAssetServiceImpl implements PublicAssetService { } @Override - public boolean delete(String code) { - return publicAssetMapper.deleteByPrimaryKey(code) > 0; + public boolean delete(Integer id) { + return publicAssetMapper.deleteByPrimaryKey(id) > 0; } } diff --git a/src/main/java/cn/redrock/assetmanage/service/impl/TokenServiceImpl.java b/src/main/java/cn/redrock/assetmanage/service/impl/TokenServiceImpl.java index bf770e2..4427ffa 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/TokenServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/TokenServiceImpl.java @@ -39,9 +39,13 @@ public class TokenServiceImpl implements TokenService { amToken.setToken(token); tokenMapper.insert(amToken); }else{ - amToken.setToken(token); - amToken.setExpireTime(expireTime); - tokenMapper.updateTokenById(amToken); + if(amToken.getExpireTime().getTime() - new Date().getTime() < 0){ + amToken.setToken(token); + amToken.setExpireTime(expireTime); + tokenMapper.updateTokenById(amToken); + }else{ + token = amToken.getToken(); + } } Map map = new HashMap<>(); map.put("token", token); diff --git a/src/main/java/cn/redrock/assetmanage/service/impl/UserServiceImpl.java b/src/main/java/cn/redrock/assetmanage/service/impl/UserServiceImpl.java index 87556f6..2a5af37 100644 --- a/src/main/java/cn/redrock/assetmanage/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/redrock/assetmanage/service/impl/UserServiceImpl.java @@ -75,14 +75,9 @@ public class UserServiceImpl implements UserService { log.info("can't find user with id {}",userId); return false; } - if(user.getName() != null && !oldUser.getName().equals(user.getName())){ - if(userMapper.findUserByName(user.getName()) != null){ - log.info("user {} already exists",user.getName()); - return false; - } - } BeanUtilsExt.copyPropertiesIgnoreNull(user,oldUser); oldUser.setUpdateTime(new Date()); + oldUser.setName(null); return userMapper.updateByPrimaryKeySelective(oldUser) > 0; } diff --git a/src/main/java/cn/redrock/assetmanage/utils/ExcelUtils.java b/src/main/java/cn/redrock/assetmanage/utils/ExcelUtils.java index b893f09..99e842f 100644 --- a/src/main/java/cn/redrock/assetmanage/utils/ExcelUtils.java +++ b/src/main/java/cn/redrock/assetmanage/utils/ExcelUtils.java @@ -237,7 +237,7 @@ public class ExcelUtils { })).collect(Collectors.toList()); Workbook wb = new XSSFWorkbook(); - Sheet sheet = wb.createSheet("sheet1"); + Sheet sheet = wb.createSheet("Sheet1"); AtomicInteger ai = new AtomicInteger(); { Row row = sheet.createRow(ai.getAndIncrement()); @@ -288,7 +288,7 @@ public class ExcelUtils { }); } //冻结窗格 - wb.getSheet("sheet1").createFreezePane(0, 1, 0, 1); + wb.getSheet("Sheet1").createFreezePane(0, 1, 0, 1); return wb; }