新增和编辑都改为操作成功

2022-06-16 16:46:27 +08:00
parent db0d26b2fc
commit c1b7ec3b31
45 changed files with 105 additions and 105 deletions
@@ -67,7 +67,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SysMessage sysMessage) {
 		sysMessageService.save(sysMessage);
-		return Result.OK("添加成功！");
+		return Result.OK("操作成功!");
 	}

 	/**
@@ -79,7 +79,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody SysMessage sysMessage) {	
 		sysMessageService.updateById(sysMessage);
-        return Result.OK("修改成功!");
+        return Result.OK("操作成功!");

 	}

@@ -73,7 +73,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
 		sysMessageTemplateService.save(sysMessageTemplate);
-        return Result.OK("添加成功！");
+        return Result.OK("操作成功!");
 	}

 	/**
@@ -159,7 +159,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 		}
 		boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver());
 		if (is_sendSuccess) {
-			return Result.OK("发送消息任务添加成功！");
+			return Result.OK("发送消息任务操作成功!");
 		} else {
 			return Result.error("发送消息任务添加失败！");
 		}
@@ -123,7 +123,7 @@ public class SysAnnouncementController {
 			sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 			sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布
 			sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -147,7 +147,7 @@ public class SysAnnouncementController {
 			// update-end-author:liusq date:20210804 for:标题处理xss攻击的问题
 			boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
 			if(ok) {
-				return Result.OK("修改成功!");
+				return Result.OK("操作成功!");
 			}
 		}

@@ -91,7 +91,7 @@ public class SysAnnouncementSendController {
 	public Result<Object> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
 		try {
 			sysAnnouncementSendService.save(sysAnnouncementSend);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -111,7 +111,7 @@ public class SysAnnouncementSendController {
 		}else {
 			boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
 			if(ok) {
-				return Result.OK("修改成功!");
+				return Result.OK("操作成功!");
 			}
 		}
 		
@@ -99,7 +99,7 @@ public class SysCategoryController {
 	public Result<Object> add(@RequestBody SysCategory sysCategory) {
 		try {
 			sysCategoryService.addSysCategory(sysCategory);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -119,7 +119,7 @@ public class SysCategoryController {
 			return Result.error("未找到对应实体");
 		}else {
 			sysCategoryService.updateSysCategory(sysCategory);
-			return Result.OK("修改成功!");
+			return Result.OK("操作成功!");
 		}
 	}
 	
@@ -101,7 +101,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
    @PostMapping(value = "/add")
    public Result add(@RequestBody SysCheckRule sysCheckRule) {
        sysCheckRuleService.save(sysCheckRule);
-        return Result.OK("添加成功！");
+        return Result.OK("操作成功!");
    }

    /**
@@ -115,7 +115,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
    @PutMapping(value = "/edit")
    public Result edit(@RequestBody SysCheckRule sysCheckRule) {
        sysCheckRuleService.updateById(sysCheckRule);
-        return Result.OK("编辑成功!");
+        return Result.OK("操作成功!");
    }

    /**
@@ -113,7 +113,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
        } catch (Exception e) {
            e.printStackTrace();
        }
-        return Result.OK("添加成功！");
+        return Result.OK("操作成功!");
    }

    /**
@@ -138,7 +138,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
        } catch (Exception e) {
            e.printStackTrace();
        }
-        return Result.OK("编辑成功!");
+        return Result.OK("操作成功!");
    }

    /**
@@ -179,7 +179,7 @@ public class SysDepartController {
 		try {
 			sysDepart.setCreateBy(username);
 			sysDepartService.saveDepartData(sysDepart, username);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -205,7 +205,7 @@ public class SysDepartController {
 		} else {
 			boolean ok = sysDepartService.updateDepartDataById(sysDepart, username);
 			if (ok) {
-				return Result.OK("修改成功!");
+				return Result.OK("操作成功!");
 			}
 		}
 		return Result.OK();
@@ -81,7 +81,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SysDepartPermission sysDepartPermission) {
 		sysDepartPermissionService.save(sysDepartPermission);
-		return Result.OK("添加成功！");
+		return Result.OK("操作成功!");
 	}
 	
 	/**
@@ -94,7 +94,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) {
 		sysDepartPermissionService.updateById(sysDepartPermission);
-		return Result.OK("编辑成功!");
+		return Result.OK("操作成功!");
 	}
 	
 	/**
@@ -338,7 +338,7 @@ public class SysDictController {
 			sysDictService.save(sysDict);
 			//添加成功后需要刷新缓存
 			sysDictService.refreshCache();
-			return Result.OK("保存成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -362,7 +362,7 @@ public class SysDictController {
 			if(ok) {
 				//编辑成功后需要刷新缓存
 				sysDictService.refreshCache();
-				return Result.OK("编辑成功!");
+				return Result.OK("操作成功!");
 			}
 		}
 		return Result.OK();
@@ -81,7 +81,7 @@ public class SysDictItemController {
 		try {
 			sysDictItem.setCreateTime(new Date());
 			sysDictItemService.save(sysDictItem);
-			return Result.OK("保存成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return Result.error("操作失败");
@@ -105,7 +105,7 @@ public class SysDictItemController {
 			sysDictItem.setUpdateTime(new Date());
 			boolean ok = sysDictItemService.updateById(sysDictItem);
 			if(ok) {
-				return Result.OK("编辑成功!");
+				return Result.OK("操作成功!");
 			}
 		}
 		return Result.OK();
@@ -82,7 +82,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody SysFillRule sysFillRule) {
        sysFillRuleService.save(sysFillRule);
-        return Result.OK("添加成功！");
+        return Result.OK("操作成功!");
    }

    /**
@@ -96,7 +96,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
    @PutMapping(value = "/edit")
    public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
        sysFillRuleService.updateById(sysFillRule);
-        return Result.OK("编辑成功!");
+        return Result.OK("操作成功!");
    }

    /**
@@ -33,7 +33,7 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
    @PostMapping(value = "/updateAll")
    public Result<?> updateAll(@RequestBody JSONObject json) {
        sysGatewayRouteService.updateAll(json);
-        return Result.OK("操作成功！");
+        return Result.OK("操作成功!");
    }

 	@GetMapping(value = "/page")
@@ -248,7 +248,7 @@ public class SysPermissionController {
 		try {
 			permission = PermissionDataUtil.intelligentProcessData(permission);
 			sysPermissionService.addPermission(permission);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("操作失败");
@@ -266,7 +266,7 @@ public class SysPermissionController {
 		try {
 			permission = PermissionDataUtil.intelligentProcessData(permission);
 			sysPermissionService.editPermission(permission);
-			return Result.OK("修改成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("操作失败");
@@ -400,7 +400,7 @@ public class SysPermissionController {
 			String lastPermissionIds = json.getString("lastpermissionIds");
 			this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds);
 			log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
-			return Result.OK("保存成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("授权失败！");
@@ -684,7 +684,7 @@ public class SysPermissionController {
 		try {
 			sysPermissionDataRule.setCreateTime(new Date());
 			sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("操作失败");
@@ -771,7 +771,7 @@ public class SysPermissionController {
 			String lastPermissionIds = json.getString("lastpermissionIds");
 			this.sysDepartPermissionService.saveDepartPermission(departId, permissionIds, lastPermissionIds);
 			log.info("======部门授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
-			return Result.OK("保存成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("授权失败！");
@@ -117,7 +117,7 @@ public class SysRoleController {
 		try {
 			role.setCreateTime(new Date());
 			sysRoleService.save(role);
-			return Result.OK("添加成功！");
+			return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return Result.error("操作失败");
@@ -140,7 +140,7 @@ public class SysRoleController {
 			role.setUpdateTime(new Date());
 			boolean ok = sysRoleService.updateById(role);
 			if(ok) {
-				return Result.OK("修改成功!");
+				return Result.OK("操作成功!");
 			}
 		}
 		
@@ -351,7 +351,7 @@ public class SysRoleController {
 			log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e);
 			return Result.error("保存失败");
 		}
-		return Result.OK("保存成功!");
+		return Result.OK("操作成功!");
 	}
 	
 	
@@ -65,7 +65,7 @@ public class SysTenantController {

        try {
            sysTenantService.save(sysTenant);
-            return Result.OK("添加成功！");
+            return Result.OK("操作成功!");
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            return Result.error("操作失败");
@@ -85,7 +85,7 @@ public class SysTenantController {
        }else {
            boolean ok = sysTenantService.updateById(tenant);
            if(ok) {
-                return Result.OK("修改成功!");
+                return Result.OK("操作成功!");
            }
        }
        return Result.OK();
@@ -156,7 +156,7 @@ public class SysUserController {

            // 保存用户走一个service 保证事务
            sysUserService.saveUser(user, selectedRoles, selectedDeparts);
-            return Result.OK("添加成功！");
+            return Result.OK("操作成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
            return Result.error("操作失败");
@@ -198,7 +198,7 @@ public class SysUserController {
 				user.setPassword(sysUser.getPassword());
                // 修改用户走一个service 保证事务
                sysUserService.editUser(user, roles, departs);
-                return Result.OK("修改成功!");
+                return Result.OK("操作成功!");
 			}
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
@@ -611,7 +611,7 @@ public class SysUserController {
                }

            }
-            result.setMessage("添加成功!");
+            result.setMessage("操作成功!");
            result.setSuccess(true);
            return result;
        }catch(Exception e) {
@@ -741,7 +741,7 @@ public class SysUserController {
                    sysUserDepartService.save(sysUserDepart);
                }
            }
-            result.setMessage("添加成功!");
+            result.setMessage("操作成功!");
            result.setSuccess(true);
            return result;
        }catch(Exception e) {
@@ -87,7 +87,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
        String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
        sysUser.setPassword(passwordEncode);
        this.userMapper.updateById(sysUser);
-        return Result.OK("密码修改成功!");
+        return Result.OK("密码操作成功!");
    }

    @Override