Commit 1f98e347 authored by suhuiguang's avatar suhuiguang

feat(jg): 压力管道后续业务

1.启用停用代码提交
parent 66e9c6fe
...@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEnableDisableServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEnableDisableServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto; import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto;
...@@ -14,9 +12,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption; ...@@ -14,9 +12,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
...@@ -31,13 +29,11 @@ import java.util.Map; ...@@ -31,13 +29,11 @@ import java.util.Map;
@RestController @RestController
@Api(tags = "Api") @Api(tags = "Api")
@RequestMapping(value = "/jg-enable-disable") @RequestMapping(value = "/jg-enable-disable")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class JgEnableDisableController extends BaseController { public class JgEnableDisableController extends BaseController {
@Autowired
JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
@Autowired private final JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
RedisUtils redisUtils;
/** /**
* 新增 * 新增
...@@ -48,7 +44,7 @@ public class JgEnableDisableController extends BaseController { ...@@ -48,7 +44,7 @@ public class JgEnableDisableController extends BaseController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<Object> save(@RequestBody JSONObject map) { public ResponseModel<Object> save(@RequestBody JSONObject map) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.saveOrUpdate(map, reginParams)); return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.saveOrUpdate(map, reginParams));
} }
...@@ -64,7 +60,7 @@ public class JgEnableDisableController extends BaseController { ...@@ -64,7 +60,7 @@ public class JgEnableDisableController extends BaseController {
Page<Map<String, Object>> page = new Page<>(); Page<Map<String, Object>> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.pageList(page, sort, dto, client)); return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.pageList(page, sort, dto, client, getSelectedOrgInfo()));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
...@@ -75,7 +71,7 @@ public class JgEnableDisableController extends BaseController { ...@@ -75,7 +71,7 @@ public class JgEnableDisableController extends BaseController {
String.valueOf(map.get("instanceId")), String.valueOf(map.get("instanceId")),
String.valueOf(map.get("operate")), String.valueOf(map.get("operate")),
String.valueOf(map.get("comment")), String.valueOf(map.get("comment")),
String.valueOf(map.get("nextTaskId"))); String.valueOf(map.get("nextTaskId")), getSelectedOrgInfo());
return ResponseHelper.buildResponse("ok"); return ResponseHelper.buildResponse("ok");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment