From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairDetailController.java | 114 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairDetailController.java
index 8c64303..4bdb9dd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairDetailController.java
@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -10,22 +11,21 @@
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.EamMajorPartialRepairDetail;
import org.jeecg.modules.eam.service.IEamMajorPartialRepairDetailService;
-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.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -34,17 +34,18 @@
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
/**
- * @Description: 澶т慨椤逛慨鏄庣粏琛�
+ * @Description: eam_major_partial_repair_detail
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-06-20
* @Version: V1.0
*/
-@Slf4j
-@Api(tags="澶т慨椤逛慨鏄庣粏琛�")
+@Api(tags="eam_major_partial_repair_detail")
@RestController
@RequestMapping("/eam/eamMajorPartialRepairDetail")
+@Slf4j
public class EamMajorPartialRepairDetailController extends JeecgController<EamMajorPartialRepairDetail, IEamMajorPartialRepairDetailService> {
@Autowired
private IEamMajorPartialRepairDetailService eamMajorPartialRepairDetailService;
@@ -58,10 +59,10 @@
* @param req
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-鍒嗛〉鍒楄〃鏌ヨ", notes="澶т慨椤逛慨鏄庣粏琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ //@AutoLog(value = "eam_major_partial_repair_detail-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="eam_major_partial_repair_detail-鍒嗛〉鍒楄〃鏌ヨ", notes="eam_major_partial_repair_detail-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamMajorPartialRepairDetail eamMajorPartialRepairDetail,
+ public Result<IPage<EamMajorPartialRepairDetail>> queryPageList(EamMajorPartialRepairDetail eamMajorPartialRepairDetail,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
@@ -72,59 +73,63 @@
}
/**
- * 娣诲姞
+ * 娣诲姞
*
* @param eamMajorPartialRepairDetail
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-娣诲姞")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-娣诲姞", notes="澶т慨椤逛慨鏄庣粏琛�-娣诲姞")
+ @AutoLog(value = "eam_major_partial_repair_detail-娣诲姞")
+ @ApiOperation(value="eam_major_partial_repair_detail-娣诲姞", notes="eam_major_partial_repair_detail-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:add")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
+ public Result<String> add(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
eamMajorPartialRepairDetailService.save(eamMajorPartialRepairDetail);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
- * 缂栬緫
+ * 缂栬緫
*
* @param eamMajorPartialRepairDetail
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-缂栬緫")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-缂栬緫", notes="澶т慨椤逛慨鏄庣粏琛�-缂栬緫")
+ @AutoLog(value = "eam_major_partial_repair_detail-缂栬緫")
+ @ApiOperation(value="eam_major_partial_repair_detail-缂栬緫", notes="eam_major_partial_repair_detail-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
+ public Result<String> edit(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
eamMajorPartialRepairDetailService.updateById(eamMajorPartialRepairDetail);
return Result.OK("缂栬緫鎴愬姛!");
}
/**
- * 閫氳繃id鍒犻櫎
+ * 閫氳繃id鍒犻櫎
*
* @param id
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鍒犻櫎", notes="澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鍒犻櫎")
+ @AutoLog(value = "eam_major_partial_repair_detail-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="eam_major_partial_repair_detail-閫氳繃id鍒犻櫎", notes="eam_major_partial_repair_detail-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:delete")
@DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
eamMajorPartialRepairDetailService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
/**
- * 鎵归噺鍒犻櫎
+ * 鎵归噺鍒犻櫎
*
* @param ids
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-鎵归噺鍒犻櫎")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-鎵归噺鍒犻櫎", notes="澶т慨椤逛慨鏄庣粏琛�-鎵归噺鍒犻櫎")
+ @AutoLog(value = "eam_major_partial_repair_detail-鎵归噺鍒犻櫎")
+ @ApiOperation(value="eam_major_partial_repair_detail-鎵归噺鍒犻櫎", notes="eam_major_partial_repair_detail-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.eamMajorPartialRepairDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
/**
@@ -133,35 +138,40 @@
* @param id
* @return
*/
- @AutoLog(value = "澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鏌ヨ")
- @ApiOperation(value="澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鏌ヨ", notes="澶т慨椤逛慨鏄庣粏琛�-閫氳繃id鏌ヨ")
+ //@AutoLog(value = "eam_major_partial_repair_detail-閫氳繃id鏌ヨ")
+ @ApiOperation(value="eam_major_partial_repair_detail-閫氳繃id鏌ヨ", notes="eam_major_partial_repair_detail-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+ public Result<EamMajorPartialRepairDetail> queryById(@RequestParam(name="id",required=true) String id) {
EamMajorPartialRepairDetail eamMajorPartialRepairDetail = eamMajorPartialRepairDetailService.getById(id);
+ if(eamMajorPartialRepairDetail==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
return Result.OK(eamMajorPartialRepairDetail);
}
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamMajorPartialRepairDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
- return super.exportXls(request, eamMajorPartialRepairDetail, EamMajorPartialRepairDetail.class, "澶т慨椤逛慨鏄庣粏琛�");
- }
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamMajorPartialRepairDetail
+ */
+ //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
+ return super.exportXls(request, eamMajorPartialRepairDetail, EamMajorPartialRepairDetail.class, "eam_major_partial_repair_detail");
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamMajorPartialRepairDetail.class);
- }
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("eam_major_partial_repair_detail:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamMajorPartialRepairDetail.class);
+ }
}
--
Gitblit v1.9.3