Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

日志管理-系统记录操作类型修改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-05 17:25:12 +08:00
parent 418ac7cc79
commit 5875e360e2
12 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java
+5
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.machine;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.system.controller.admin.machine.vo.*;
import com.cf.imes.module.system.service.machine.MachineService;
import io.swagger.v3.oas.annotations.Operation;
@@ -15,6 +16,8 @@ import java.util.List;
import java.util.Map;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
/**
* @author Beal
@@ -29,6 +32,7 @@ public class MachineAuthController {
@PutMapping("insert-organ-auth")
@OperateLog(type = CREATE)
@Operation(summary = "组织机台授权信息新增")
@PreAuthorize("@ss.hasPermission('machine-auth::update')")
public CommonResult<Boolean> authInsert(@RequestBody MachineOrgAuthReq vo) {
@@ -38,6 +42,7 @@ public class MachineAuthController {
@PostMapping("update-organ-auth")
@Operation(summary = "修改组织机台数量")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('machine-auth::update')")
public CommonResult<Boolean> authUpdate(@RequestBody MachineOrgAuthReq vo) {
return success(machineService.authUpdate(vo));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+7 -8
View File
@@ -9,12 +9,12 @@ import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.system.controller.admin.machine.vo.*;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.service.machine.MachineService;
import com.cf.imes.module.system.service.machine.MachineTemplateService;
import com.cf.imes.module.system.validation.machine.MachineTypeValid;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +24,8 @@ import java.util.List;
import java.util.Map;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
@Tag(name = "管理后台 - 机台")
@@ -35,21 +37,18 @@ public class MachineController {
@Resource
private MachineService machineService;
@Resource
private MachineTemplateService machineTemplateService;
@PutMapping("/create-cutting")
@Operation(summary = "创建机台")
//@PreAuthorize("@ss.hasPermission('machine::create')")
@OperateLog(logArgs = false)
// @PreAuthorize("@ss.hasAnyPermissions('system:machine:create','system:machine:duplet')")
@OperateLog(logArgs = false,type = CREATE )
public CommonResult<Long> createCutting(@Validated(CreateGroup.class) @RequestBody CuttingSaveReqVO createReqVO) throws JsonProcessingException {
return success(machineService.createCutting(createReqVO));
}
@PostMapping("/update-cutting")
@Operation(summary = "更新机台")
//@PreAuthorize("@ss.hasPermission('machine::update')")
@OperateLog(logArgs = false)
// @PreAuthorize("@ss.hasAnyPermissions('system:machine:update','system:machine:submit')")
@OperateLog(logArgs = false,type = UPDATE)
public CommonResult<Boolean> update(@Validated(UpdateGroup.class) @RequestBody CuttingSaveReqVO updateReqVO) {
machineService.updateCutting(updateReqVO);
return success(true);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java
+8 -5
View File
@@ -17,6 +17,8 @@ import java.util.List;
import java.util.Map;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
/**
* @author there
@@ -49,16 +51,16 @@ public class MachineTemplateController {
@PutMapping("insert-template-machine")
@Operation(summary = "新增机台模板配置")
@PreAuthorize("@ss.hasPermission('machine-template::create')")
@OperateLog(logArgs = false)
@PreAuthorize("@ss.hasAnyPermissions('machine-template::create','machine-template::duplet')")
@OperateLog(logArgs = false,type = CREATE)
public CommonResult<Long> createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
return success(machineTemplateService.createCuttingTemplate(reqVO));
}
@PostMapping("update-template-machine")
@Operation(summary = "修改机台模板配置")
@PreAuthorize("@ss.hasPermission('machine-template::update')")
@OperateLog(logArgs = false)
@PreAuthorize("@ss.hasAnyPermissions('machine-template::update','baseConfig:machine:submit')")
@OperateLog(logArgs = false,type = UPDATE)
public CommonResult<Boolean> updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
return success(machineTemplateService.updateCuttingTemplate(reqVO));
}
@@ -87,7 +89,8 @@ public class MachineTemplateController {
@PutMapping("insert-template-machine-brand")
@Operation(summary = "新增机台模板品牌")
@PreAuthorize("@ss.hasPermission('machine-template::create')")
@OperateLog(type = CREATE)
@PreAuthorize("@ss.hasPermission('machine-template::insert-brand')")
public CommonResult<Boolean> createMachineTemplateBrand(@RequestBody MachineTemplateBrandReqVO reqVO) {
machineTemplateService.createMachineTemplateBrand(reqVO);
return success(true);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+5 -3
View File
@@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.permission;
import cn.hutool.core.collection.CollUtil;
import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.framework.security.core.LoginUser;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
@@ -12,8 +13,8 @@ import com.cf.imes.module.system.controller.admin.permission.vo.permission.Permi
import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleUserReqVO;
import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO;
import com.cf.imes.module.system.enums.ErrorCodeConstants;
import com.cf.imes.module.system.service.permission.PermissionService;
import com.cf.imes.module.system.service.organ.OrganService;
import com.cf.imes.module.system.service.permission.PermissionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +28,7 @@ import java.util.Objects;
import java.util.Set;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
/**
* 权限 Controller，提供赋予用户、角色的权限的 API 接口
@@ -53,8 +55,8 @@ public class PermissionController {
}
@PostMapping("/assign-role-menu")
@Operation(summary = "赋予角色菜单")
// @PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')")
@Operation(summary = "修改角色的菜单权限")
@OperateLog(module="管理后台 - 权限",name = "修改角色的菜单权限",type = UPDATE)
@PreAuthorize("@ss.hasAnyPermissions('system:permission:assign-role-menu','base:permission:assign-role-menu')")
public CommonResult<Boolean> assignRoleMenu(@Validated @RequestBody PermissionAssignRoleMenuReqVO reqVO) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java
+7 -1
View File
@@ -2,18 +2,22 @@ package com.cf.imes.module.system.controller.admin.setting;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.system.controller.admin.setting.vo.PackageConfigReqVO;
import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO;
import com.cf.imes.module.system.service.setting.SettingService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
@Tag(name = "管理后台 - 系统打包配置")
@RestController
@@ -29,6 +33,7 @@ public class SettingController {
@PutMapping("/insert")
@Operation(summary = "新增打包系统配置")
@OperateLog(module="管理后台 - 系统打包配置",name = "新增打包/预打包系统配置",type = CREATE)
//@PreAuthorize("@ss.hasPermission('system:data-source:query')")
public CommonResult<Long> insertSetting( @RequestBody PackageConfigReqVO reqVO ) {
@@ -41,7 +46,8 @@ public class SettingController {
@PostMapping("/update")
@Operation(summary = "更新打包系统配置")
//@PreAuthorize("@ss.hasPermission('system:data-source:query')")
@OperateLog(module="管理后台 - 系统打包配置",name = "更新打包/预打包系统配置",type = UPDATE)
// @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-config','manage:pack:pre-pack-config')")
public CommonResult<Long> updateSetting( @RequestBody PackageConfigReqVO reqVO ) {
return success(settingService.updateSetting(reqVO));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java
+6 -2
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.systemconfig;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.system.controller.admin.systemconfig.vo.*;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
import com.cf.imes.module.system.service.systemconfig.SystemConfigService;
@@ -16,6 +17,7 @@ import javax.validation.Valid;
import java.util.List;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
/**
* 系统配置管理控制器
@@ -49,6 +51,7 @@ public class SystemConfigController {
@PostMapping("/status")
@Operation(summary = "修改系统配置状态")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
public CommonResult<Boolean> updateConfigStatus(@Valid @RequestBody ConfigUpdateStatusReqVO reqVO){
systemConfigService.updateStatus(reqVO);
@@ -57,6 +60,7 @@ public class SystemConfigController {
@PostMapping("/sort")
@Operation(summary = "修改系统配置的顺序")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
public CommonResult<Boolean> updateConfigSort(@Valid @RequestBody List<ConfigUpdateSortReqVO> reqVO){
systemConfigService.updateConfigSort(reqVO);
@@ -65,8 +69,8 @@ public class SystemConfigController {
@PostMapping()
@Operation(summary = "修改系统配置")
@PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
@Operation(summary = "新增/修改系统配置")
// @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:setting','system:base-setting:save','system:base-setting:copy')")
public CommonResult<Boolean> modifySystemConfig(@Valid @RequestBody ConfigSaveReqVO reqVO) {
systemConfigService.modifySystemConfig(reqVO);
return success(true);