From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
index 5b32de5..1b6d19c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
@@ -1,39 +1,27 @@
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.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamPrecisionParameters;
-import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
-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.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;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.entity.EamPrecisionParameters;
+import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
/**
* @Description: 绮惧害鍙傛暟缁存姢
@@ -48,6 +36,9 @@
public class EamPrecisionParametersController extends JeecgController<EamPrecisionParameters, IEamPrecisionParametersService> {
@Autowired
private IEamPrecisionParametersService eamPrecisionParametersService;
+
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -58,7 +49,6 @@
* @param req
* @return
*/
- @AutoLog(value = "绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters,
@@ -67,6 +57,7 @@
HttpServletRequest req) {
QueryWrapper<EamPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionParameters, req.getParameterMap());
Page<EamPrecisionParameters> page = new Page<EamPrecisionParameters>(pageNo, pageSize);
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
IPage<EamPrecisionParameters> pageList = eamPrecisionParametersService.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -77,10 +68,12 @@
* @param eamPrecisionParameters
* @return
*/
- @AutoLog(value = "绮惧害鍙傛暟缁存姢-娣诲姞")
@ApiOperation(value="绮惧害鍙傛暟缁存姢-娣诲姞", notes="绮惧害鍙傛暟缁存姢-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PRECISION_PARAMETERS_RULE);
+ eamPrecisionParameters.setParameterCode(codeSeq);
+ eamPrecisionParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
eamPrecisionParametersService.save(eamPrecisionParameters);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -91,7 +84,6 @@
* @param eamPrecisionParameters
* @return
*/
- @AutoLog(value = "绮惧害鍙傛暟缁存姢-缂栬緫")
@ApiOperation(value="绮惧害鍙傛暟缁存姢-缂栬緫", notes="绮惧害鍙傛暟缁存姢-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
@@ -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