diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java index bb5eccb4..aa2dcb16 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java @@ -420,14 +420,17 @@ public class BaseTyreController extends BaseController { // 同车互换接口,实际就是修改基础信息表 @PostMapping("/changeTyreForOneCar") - public AjaxResult changeTyreForOneCar(Long oldTyreId, Long newTyreId, String oldLocation, String newLocation) { + @ResponseBody + public AjaxResult changeTyreForOneCar(Long oldTyreId, Long newTyreId, String oldLocation, String newLocation,String user) { BaseTyre baseTyre1 = new BaseTyre(); baseTyre1.setTyreId(oldTyreId); baseTyre1.setWheelPostion(newLocation); + baseTyre1.setUpdateBy(user); int i = baseTyreService.updateBaseTyre(baseTyre1); BaseTyre baseTyre2 = new BaseTyre(); baseTyre2.setTyreId(newTyreId); baseTyre2.setWheelPostion(oldLocation); + baseTyre2.setUpdateBy(user); i += baseTyreService.updateBaseTyre(baseTyre2); return i == 2 ? success() : error(); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 3041ff34..8d61c923 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -335,6 +335,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/tyre/inventory/pdaOutInventory", "anon,captchaValidate"); filterChainDefinitionMap.put("/tyre/car/PdaQueryCarList", "anon,captchaValidate"); filterChainDefinitionMap.put("/tyre/**", "anon,captchaValidate"); + filterChainDefinitionMap.put("/tyre/tyre/changeTyreForOneCar", "anon,captchaValidate"); filterChainDefinitionMap.put("/tyre/install/PdaInstallTyre", "anon,captchaValidate"); filterChainDefinitionMap.put("/tyre/install/PdaUnInstallTyre", "anon,captchaValidate"); filterChainDefinitionMap.put("/tyre/check/PdaAddCheck", "anon,captchaValidate"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreMileageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreMileageService.java index 12d5af94..5264121a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreMileageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreMileageService.java @@ -61,4 +61,8 @@ public interface IRecordTyreMileageService * @return 结果 */ public int deleteRecordTyreMileageById(Long id); + + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java index 805f06e3..3abe49dc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java @@ -134,7 +134,10 @@ public class BaseTyreServiceImpl implements IBaseTyreService { baseTyre.setUpdateTime(DateUtils.getNowDate()); - baseTyre.setUpdateBy(getLoginName()); + if (baseTyre.getUpdateBy()==null) { + baseTyre.setUpdateBy(getLoginName()); + } + return baseTyreMapper.updateBaseTyre(baseTyre); }