From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionAssignRuleController.java | 139 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 136 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionAssignRuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionAssignRuleController.java
index 82c7e6d..9853c3a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionAssignRuleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionAssignRuleController.java
@@ -1,8 +1,28 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TMissionAssignRuleDTO;
+import com.ruoyi.system.model.TMissionAssignRule;
+import com.ruoyi.system.model.TMissionAssignRuleIndicator;
+import com.ruoyi.system.query.TMissionAssignRuleQuery;
+import com.ruoyi.system.service.TMissionAssignRuleIndicatorService;
+import com.ruoyi.system.service.TMissionAssignRuleService;
+import com.ruoyi.system.vo.TMissionAssignRuleVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -12,9 +32,122 @@
* @author xiaochen
* @since 2025-09-28
*/
+@Api(tags = "任务指派规则")
@RestController
-@RequestMapping("/t-mission-assign-rule")
+@RequestMapping("")
public class TMissionAssignRuleController {
+ private final TMissionAssignRuleService missionAssignRuleService;
+ private final TMissionAssignRuleIndicatorService missionAssignRuleIndicatorService;
+ private final TokenService tokenService;
+ @Autowired
+ public TMissionAssignRuleController(TMissionAssignRuleService missionAssignRuleService, TMissionAssignRuleIndicatorService missionAssignRuleIndicatorService, TokenService tokenService) {
+ this.missionAssignRuleService = missionAssignRuleService;
+ this.missionAssignRuleIndicatorService = missionAssignRuleIndicatorService;
+ this.tokenService = tokenService;
+ }
+
+ /**
+ * 任务指派规则列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:list')")
+ @ApiOperation(value = "任务指派规则分页列表", response = TMissionAssignRuleQuery.class)
+ @PostMapping(value = "/api/t-mission-assign-rule/pageList")
+ public R<PageInfo<TMissionAssignRuleVO>> pageList(@RequestBody String param) {
+ TMissionAssignRuleQuery query = JSON.parseObject(param, TMissionAssignRuleQuery.class);
+ return R.ok(missionAssignRuleService.pageList(query));
+ }
+
+ /**
+ * 添加任务指派规则管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:add')")
+ @Log(title = "任务指派规则信息-新增任务指派规则", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加任务指派规则",response = TMissionAssignRuleDTO.class)
+ @PostMapping(value = "/api/t-mission-assign-rule/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TMissionAssignRuleDTO dto = JSON.parseObject(param,TMissionAssignRuleDTO.class);
+ if(missionAssignRuleService.isExit(dto)){
+ return R.fail("该任务类型已存在");
+ }
+ List<TMissionAssignRuleIndicator> missionAssignRuleIndicators = dto.getMissionAssignRuleIndicators();
+ if(CollectionUtils.isEmpty(missionAssignRuleIndicators)){
+ return R.fail("指派指标不可为空");
+ }
+ missionAssignRuleService.save(dto);
+ // 存储指派指标详情
+ missionAssignRuleIndicators.forEach(missionAssignRuleIndicator -> {
+ missionAssignRuleIndicator.setRuleId(dto.getId());
+ });
+ missionAssignRuleIndicatorService.saveBatch(missionAssignRuleIndicators);
+ return R.ok();
+ }
+
+ /**
+ * 修改任务指派规则
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:edit')")
+ @Log(title = "任务指派规则信息-修改任务指派规则", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改任务指派规则")
+ @PostMapping(value = "/api/t-mission-assign-rule/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TMissionAssignRuleDTO dto = JSON.parseObject(param,TMissionAssignRuleDTO.class);
+ if(missionAssignRuleService.isExit(dto)){
+ return R.fail("该任务类型已存在");
+ }
+ List<TMissionAssignRuleIndicator> missionAssignRuleIndicators = dto.getMissionAssignRuleIndicators();
+ if(CollectionUtils.isEmpty(missionAssignRuleIndicators)){
+ return R.fail("指派指标不可为空");
+ }
+ missionAssignRuleService.updateById(dto);
+ // 删除指标
+ missionAssignRuleIndicatorService.remove(Wrappers.lambdaQuery(TMissionAssignRuleIndicator.class).eq(TMissionAssignRuleIndicator::getRuleId,dto.getId()));
+ // 存储指派指标详情
+ missionAssignRuleIndicators.forEach(missionAssignRuleIndicator -> {
+ missionAssignRuleIndicator.setRuleId(dto.getId());
+ });
+ missionAssignRuleIndicatorService.saveBatch(missionAssignRuleIndicators);
+ return R.ok();
+ }
+
+ /**
+ * 查看任务指派规则详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:detail')")
+ @ApiOperation(value = "查看任务指派规则详情")
+ @GetMapping(value = "/open/t-mission-assign-rule/getDetailById")
+ public R<TMissionAssignRuleVO> getDetailById(@RequestParam String id) {
+ TMissionAssignRule missionAssignRule = missionAssignRuleService.getById(id);
+ TMissionAssignRuleVO missionAssignRuleVO = new TMissionAssignRuleVO();
+ BeanUtils.copyProperties(missionAssignRule, missionAssignRuleVO);
+ // 查询指派指标详情
+ List<TMissionAssignRuleIndicator> missionAssignRuleIndicators = missionAssignRuleIndicatorService.list(Wrappers.lambdaQuery(TMissionAssignRuleIndicator.class)
+ .eq(TMissionAssignRuleIndicator::getRuleId,id));
+ missionAssignRuleVO.setMissionAssignRuleIndicators(missionAssignRuleIndicators);
+ return R.ok(missionAssignRuleVO);
+ }
+
+ /**
+ * 删除任务指派规则
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:delete')")
+ @Log(title = "任务指派规则信息-删除任务指派规则", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除任务指派规则")
+ @DeleteMapping(value = "/open/t-mission-assign-rule/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(missionAssignRuleService.removeById(id));
+ }
+
+ /**
+ * 批量删除任务指派规则
+ */
+ //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:delete')")
+ @Log(title = "任务指派规则信息-删除任务指派规则", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除任务指派规则")
+ @DeleteMapping(value = "/open/t-mission-assign-rule/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ return R.ok(missionAssignRuleService.removeByIds(ids));
+ }
+
}
--
Gitblit v1.7.1