From 5cd4558fb1a7178653d77e1a982e6f26d06b5db5 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期一, 31 三月 2025 17:39:00 +0800 Subject: [PATCH] 中心综合利用率趋势接口 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java index d5aefc7..15627fa 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java @@ -1,37 +1,25 @@ package org.jeecg.modules.eam.controller; import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.entity.EamProcessParameters; import org.jeecg.modules.eam.service.IEamProcessParametersService; -import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -48,6 +36,9 @@ public class EamProcessParametersController extends JeecgController<EamProcessParameters, IEamProcessParametersService> { @Autowired private IEamProcessParametersService eamProcessParametersService; + + @Autowired + private ISysBusinessCodeRuleService businessCodeRuleService; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -58,7 +49,6 @@ * @param req * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamProcessParameters eamProcessParameters, @@ -66,6 +56,7 @@ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<EamProcessParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamProcessParameters, req.getParameterMap()); + queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); Page<EamProcessParameters> page = new Page<EamProcessParameters>(pageNo, pageSize); IPage<EamProcessParameters> pageList = eamProcessParametersService.page(page, queryWrapper); return Result.OK(pageList); @@ -77,10 +68,12 @@ * @param eamProcessParameters * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-娣诲姞") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-娣诲姞", notes="宸ュ簭鍙傛暟缁存姢-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) { + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PROCESS_PARAMETERS_RULE); + eamProcessParameters.setParameterCode(codeSeq); + eamProcessParameters.setDelFlag(CommonConstant.DEL_FLAG_0); eamProcessParametersService.save(eamProcessParameters); return Result.OK("娣诲姞鎴愬姛锛�"); } @@ -91,7 +84,6 @@ * @param eamProcessParameters * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-缂栬緫") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-缂栬緫", notes="宸ュ簭鍙傛暟缁存姢-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) { @@ -105,7 +97,6 @@ * @param id * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { @@ -119,7 +110,6 @@ * @param ids * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -133,7 +123,6 @@ * @param id * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { -- Gitblit v1.9.3