product-inventory-management-after.git

liyong

5 天以前 a50330dde460c33ca05eff3544de2617cd8c2fd6

feat(approve): 添加操作日志记录并更新跳转路径

- 在审批实例控制器中添加日志注解记录分页查询、保存、更新、删除和审批操作
- 在审批模板控制器中添加日志注解记录分页查询、添加、更新、删除和详情查询操作
- 在企业新闻控制器中添加日志注解记录分页查询、保存、更新和删除操作
- 更新审批实例跳转路径为 /officeProcessAutomation/ApproveManage/approve-list
- 更新企业新闻跳转路径为 /officeProcessAutomation/EnterpriseNews
- 审批模板控制器继承基类控制器以支持日志功能

已修改5个文件

	src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java

@@ -4,6 +4,8 @@
import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
import com.ruoyi.approve.service.ApprovalInstanceService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,23 +32,27 @@
    private final ApprovalInstanceService approvalInstanceService;
    @GetMapping("/listPage")
    @Operation(summary = "分页查询")
    @Log(title = "审批列表分页查询", businessType = BusinessType.OTHER)
    public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
        return approvalInstanceService.listPage(page, approvalInstanceDto);
    }

    @PostMapping("/save")
    @Operation(summary = "保存")
    @Log(title = "审批列表保存", businessType = BusinessType.INSERT)
    public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
        return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
    }

    @PutMapping("/update")
    @Operation(summary = "更新")
    @Log(title = "审批列表更新", businessType = BusinessType.UPDATE)
    public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
        return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
    }

    @DeleteMapping("/delete")
    @Log(title = "审批列表删除", businessType = BusinessType.DELETE)
    @Operation(summary = "删除")
    public R delete(@RequestBody List<Long> ids) {
        return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
@@ -54,6 +60,7 @@

    @Operation(summary = "审批")
    @PostMapping("/approve")
    @Log(title = "审批列表审批", businessType = BusinessType.UPDATE)
    public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
        return approvalInstanceService.approve(approvalInstanceDto);
    }

 src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java

@@ -4,6 +4,9 @@
import com.ruoyi.approve.bean.dto.ApprovalTemplateDto;
import com.ruoyi.approve.bean.vo.ApprovalTemplateVo;
import com.ruoyi.approve.service.ApprovalTemplateService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,30 +27,34 @@
@RequestMapping("/approvalTemplate")
@Tag(name = "审批模板表")
@AllArgsConstructor
public class ApprovalTemplateController {
public class ApprovalTemplateController  extends BaseController {

    private final ApprovalTemplateService approvalTemplateService;

    @GetMapping("/listPage")
    @Operation(summary = "分页查询")
    @Log(title = "审批模板分页查询", businessType = BusinessType.OTHER)
    public R listPage(Page<ApprovalTemplateVo> page, ApprovalTemplateDto approvalTemplateDto) {
        return R.ok(approvalTemplateService.listPage(page, approvalTemplateDto));
    }

    @PostMapping("/add")
    @Operation(summary = "添加")
    @Log(title = "添加审批模板", businessType = BusinessType.INSERT)
    public R add(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
        return R.ok(approvalTemplateService.saveApprovalTemplateDto(approvalTemplateDto));
    }

    @PutMapping("/update")
    @Operation(summary = "修改")
    @Log(title = "修改审批模板", businessType = BusinessType.UPDATE)
    public R update(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
        return R.ok(approvalTemplateService.updateApprovalTemplateDto(approvalTemplateDto));
    }

    @PostMapping("/delete")
    @Operation(summary = "删除")
    @Log(title = "删除审批模板", businessType = BusinessType.DELETE)
    public R delete(@RequestBody List<Long> ids) {
        return R.ok(approvalTemplateService.delete(ids));
    }
@@ -60,6 +67,7 @@

    @GetMapping("/detail/{id}")
    @Operation(summary = "查询审批模板详情")
    @Log(title = "查询审批模板详情", businessType = BusinessType.OTHER)
    public R detail(@PathVariable("id") Long id) {
        return R.ok(approvalTemplateService.getApprovalTemplateVoById(id));
    }

 src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java

@@ -629,7 +629,7 @@

        String title = StringUtils.hasText(instance.getTemplateName()) ? instance.getTemplateName() : "审批提醒";
        String message = "审批单号 " + instance.getInstanceNo() + " 需要您审批";
        String jumpPath = "/approvalInstance?id=" + instance.getId();
        String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list?id=" + instance.getId();
        sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
    }

@@ -644,7 +644,7 @@
        }
        String title = "企业新闻";
        String message = "您有新的企业新闻《" + enterpriseNews.getTitle() + "》请及时查阅";
        String jumpPath = "/enterpriseNews?id=" + newsId;
        String jumpPath = "/officeProcessAutomation/EnterpriseNews?id=" + newsId;
        sysNoticeService.simpleNoticeByUser(title, message, userIds, jumpPath);
    }


 src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java

@@ -4,6 +4,8 @@
import com.ruoyi.collaborativeApproval.dto.EnterpriseNewsDto;
import com.ruoyi.collaborativeApproval.service.EnterpriseNewsService;
import com.ruoyi.collaborativeApproval.vo.EnterpriseNewsVo;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,24 +32,28 @@

    @Operation(summary = "分页查询")
    @GetMapping("/listPage")
    @Log(title = "企业新闻分页查询", businessType = BusinessType.OTHER)
    public R listPage(Page<EnterpriseNewsVo>  page , EnterpriseNewsDto enterpriseNewsDto) {
        return R.ok(enterpriseNewsService.listPage(page, enterpriseNewsDto));
    }

    @PostMapping("/save")
    @Operation(summary = "保存")
    @Log(title = "保存企业新闻", businessType = BusinessType.INSERT)
    public R save(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
        return R.ok(enterpriseNewsService.add(enterpriseNewsDto));
    }

    @PutMapping("/update")
    @Operation(summary = "更新")
    @Log(title = "更新企业新闻", businessType = BusinessType.UPDATE)
    public R update(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
        return R.ok(enterpriseNewsService.updateEnterpriseNewsDto(enterpriseNewsDto));
    }

    @DeleteMapping("/delete")
    @Operation(summary = "删除")
    @Log(title = "删除企业新闻", businessType = BusinessType.DELETE)
    public R delete(@RequestBody List<Long> ids) {
        return R.ok(enterpriseNewsService.delete(ids));
    }

 src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java

@@ -382,7 +382,7 @@

        String title = StringUtils.isNotEmpty(instance.getTemplateName()) ? instance.getTemplateName() : "审批提醒";
        String message = "审批单号 " + instance.getInstanceNo() + " 需要您审批";
        String jumpPath = "/approvalInstance?id=" + instance.getId();
        String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list/?id=" + instance.getId();
        sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
    }
}

			@@ -4,6 +4,8 @@
			import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
			import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
			import com.ruoyi.approve.service.ApprovalInstanceService;
			import com.ruoyi.framework.aspectj.lang.annotation.Log;
			import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
			import com.ruoyi.framework.web.controller.BaseController;
			import com.ruoyi.framework.web.domain.R;
			import io.swagger.v3.oas.annotations.Operation;
			@@ -30,23 +32,27 @@
			private final ApprovalInstanceService approvalInstanceService;
			@GetMapping("/listPage")
			@Operation(summary = "分页查询")
			@Log(title = "审批列表分页查询", businessType = BusinessType.OTHER)
			public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
			return approvalInstanceService.listPage(page, approvalInstanceDto);
			}

			@PostMapping("/save")
			@Operation(summary = "保存")
			@Log(title = "审批列表保存", businessType = BusinessType.INSERT)
			public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
			return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
			}

			@PutMapping("/update")
			@Operation(summary = "更新")
			@Log(title = "审批列表更新", businessType = BusinessType.UPDATE)
			public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
			return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
			}

			@DeleteMapping("/delete")
			@Log(title = "审批列表删除", businessType = BusinessType.DELETE)
			@Operation(summary = "删除")
			public R delete(@RequestBody List<Long> ids) {
			return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
			@@ -54,6 +60,7 @@

			@Operation(summary = "审批")
			@PostMapping("/approve")
			@Log(title = "审批列表审批", businessType = BusinessType.UPDATE)
			public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
			return approvalInstanceService.approve(approvalInstanceDto);
			}

			@@ -4,6 +4,9 @@
			import com.ruoyi.approve.bean.dto.ApprovalTemplateDto;
			import com.ruoyi.approve.bean.vo.ApprovalTemplateVo;
			import com.ruoyi.approve.service.ApprovalTemplateService;
			import com.ruoyi.framework.aspectj.lang.annotation.Log;
			import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
			import com.ruoyi.framework.web.controller.BaseController;
			import com.ruoyi.framework.web.domain.R;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.tags.Tag;
			@@ -24,30 +27,34 @@
			@RequestMapping("/approvalTemplate")
			@Tag(name = "审批模板表")
			@AllArgsConstructor
			public class ApprovalTemplateController {
			public class ApprovalTemplateController extends BaseController {

			private final ApprovalTemplateService approvalTemplateService;

			@GetMapping("/listPage")
			@Operation(summary = "分页查询")
			@Log(title = "审批模板分页查询", businessType = BusinessType.OTHER)
			public R listPage(Page<ApprovalTemplateVo> page, ApprovalTemplateDto approvalTemplateDto) {
			return R.ok(approvalTemplateService.listPage(page, approvalTemplateDto));
			}

			@PostMapping("/add")
			@Operation(summary = "添加")
			@Log(title = "添加审批模板", businessType = BusinessType.INSERT)
			public R add(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
			return R.ok(approvalTemplateService.saveApprovalTemplateDto(approvalTemplateDto));
			}

			@PutMapping("/update")
			@Operation(summary = "修改")
			@Log(title = "修改审批模板", businessType = BusinessType.UPDATE)
			public R update(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
			return R.ok(approvalTemplateService.updateApprovalTemplateDto(approvalTemplateDto));
			}

			@PostMapping("/delete")
			@Operation(summary = "删除")
			@Log(title = "删除审批模板", businessType = BusinessType.DELETE)
			public R delete(@RequestBody List<Long> ids) {
			return R.ok(approvalTemplateService.delete(ids));
			}
			@@ -60,6 +67,7 @@

			@GetMapping("/detail/{id}")
			@Operation(summary = "查询审批模板详情")
			@Log(title = "查询审批模板详情", businessType = BusinessType.OTHER)
			public R detail(@PathVariable("id") Long id) {
			return R.ok(approvalTemplateService.getApprovalTemplateVoById(id));
			}

			@@ -629,7 +629,7 @@

			String title = StringUtils.hasText(instance.getTemplateName()) ? instance.getTemplateName() : "审批提醒";
			String message = "审批单号 " + instance.getInstanceNo() + " 需要您审批";
			String jumpPath = "/approvalInstance?id=" + instance.getId();
			String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list?id=" + instance.getId();
			sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
			}

			@@ -644,7 +644,7 @@
			}
			String title = "企业新闻";
			String message = "您有新的企业新闻《" + enterpriseNews.getTitle() + "》请及时查阅";
			String jumpPath = "/enterpriseNews?id=" + newsId;
			String jumpPath = "/officeProcessAutomation/EnterpriseNews?id=" + newsId;
			sysNoticeService.simpleNoticeByUser(title, message, userIds, jumpPath);
			}

			@@ -4,6 +4,8 @@
			import com.ruoyi.collaborativeApproval.dto.EnterpriseNewsDto;
			import com.ruoyi.collaborativeApproval.service.EnterpriseNewsService;
			import com.ruoyi.collaborativeApproval.vo.EnterpriseNewsVo;
			import com.ruoyi.framework.aspectj.lang.annotation.Log;
			import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
			import com.ruoyi.framework.web.domain.R;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.tags.Tag;
			@@ -30,24 +32,28 @@

			@Operation(summary = "分页查询")
			@GetMapping("/listPage")
			@Log(title = "企业新闻分页查询", businessType = BusinessType.OTHER)
			public R listPage(Page<EnterpriseNewsVo> page , EnterpriseNewsDto enterpriseNewsDto) {
			return R.ok(enterpriseNewsService.listPage(page, enterpriseNewsDto));
			}

			@PostMapping("/save")
			@Operation(summary = "保存")
			@Log(title = "保存企业新闻", businessType = BusinessType.INSERT)
			public R save(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
			return R.ok(enterpriseNewsService.add(enterpriseNewsDto));
			}

			@PutMapping("/update")
			@Operation(summary = "更新")
			@Log(title = "更新企业新闻", businessType = BusinessType.UPDATE)
			public R update(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
			return R.ok(enterpriseNewsService.updateEnterpriseNewsDto(enterpriseNewsDto));
			}

			@DeleteMapping("/delete")
			@Operation(summary = "删除")
			@Log(title = "删除企业新闻", businessType = BusinessType.DELETE)
			public R delete(@RequestBody List<Long> ids) {
			return R.ok(enterpriseNewsService.delete(ids));
			}

			@@ -382,7 +382,7 @@

			String title = StringUtils.isNotEmpty(instance.getTemplateName()) ? instance.getTemplateName() : "审批提醒";
			String message = "审批单号 " + instance.getInstanceNo() + " 需要您审批";
			String jumpPath = "/approvalInstance?id=" + instance.getId();
			String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list/?id=" + instance.getId();
			sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
			}
			}