From 2dcd7f3634f2e636e10ea758441ded77e1d2c845 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 02 十二月 2024 17:15:16 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPlanCloseController.java | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPlanCloseController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPlanCloseController.java
index baf9d1b..9709389 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPlanCloseController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPlanCloseController.java
@@ -5,18 +5,21 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcPlanClose;
import org.jeecg.modules.mdc.service.IMdcPlanCloseService;
+import org.jeecg.modules.mdc.vo.MdcPlanCloseVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -24,13 +27,13 @@
import io.swagger.annotations.ApiOperation;
/**
- * @Description: mdc璁″垝鍋滄満缁存姢琛�
+ * @Description: mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�
* @Author: Lius
* @Date: 2023-07-13
* @Version: V1.0
*/
@Slf4j
-@Api(tags = "mdc璁″垝鍋滄満缁存姢琛�")
+@Api(tags = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�")
@RestController
@RequestMapping("/mdc/mdcPlanClose")
public class MdcPlanCloseController extends JeecgController<MdcPlanClose, IMdcPlanCloseService> {
@@ -47,16 +50,17 @@
* @param req
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc璁″垝鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(MdcPlanClose mdcPlanClose,
+ public Result<?> queryPageList(MdcPlanCloseVo mdcPlanClose,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcPlanClose> queryWrapper = QueryGenerator.initQueryWrapper(mdcPlanClose, req.getParameterMap());
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
Page<MdcPlanClose> page = new Page<MdcPlanClose>(pageNo, pageSize);
- IPage<MdcPlanClose> pageList = mdcPlanCloseService.page(page, queryWrapper);
+ IPage<MdcPlanClose> pageList = mdcPlanCloseService.pageList(userId, page, mdcPlanClose, req);
return Result.OK(pageList);
}
@@ -66,11 +70,17 @@
* @param mdcPlanClose
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-娣诲姞")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-娣诲姞", notes = "mdc璁″垝鍋滄満缁存姢琛�-娣诲姞")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-娣诲姞")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-娣诲姞", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody MdcPlanClose mdcPlanClose) {
- mdcPlanCloseService.save(mdcPlanClose);
+ public Result<?> add(@RequestBody MdcPlanCloseVo mdcPlanClose) {
+ if (StringUtils.isBlank(mdcPlanClose.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcPlanCloseService.addPlanClose(mdcPlanClose);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -80,8 +90,8 @@
* @param mdcPlanClose
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-缂栬緫")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-缂栬緫", notes = "mdc璁″垝鍋滄満缁存姢琛�-缂栬緫")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-缂栬緫")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-缂栬緫", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody MdcPlanClose mdcPlanClose) {
mdcPlanCloseService.updateById(mdcPlanClose);
@@ -94,8 +104,8 @@
* @param id
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎", notes = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
mdcPlanCloseService.removeById(id);
@@ -108,8 +118,8 @@
* @param ids
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-鎵归噺鍒犻櫎")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-鎵归噺鍒犻櫎", notes = "mdc璁″垝鍋滄満缁存姢琛�-鎵归噺鍒犻櫎")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鎵归噺鍒犻櫎", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.mdcPlanCloseService.removeByIds(Arrays.asList(ids.split(",")));
@@ -122,8 +132,8 @@
* @param id
* @return
*/
- @AutoLog(value = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鏌ヨ")
- @ApiOperation(value = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鏌ヨ", notes = "mdc璁″垝鍋滄満缁存姢琛�-閫氳繃id鏌ヨ")
+ @AutoLog(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鏌ヨ", notes = "mdc(璁″垝/闈炶鍒�)鍋滄満缁存姢琛�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
MdcPlanClose mdcPlanClose = mdcPlanCloseService.getById(id);
@@ -134,11 +144,17 @@
* 瀵煎嚭excel
*
* @param request
- * @param mdcPlanClose
+ * @param mdcPlanCloseVo
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcPlanClose mdcPlanClose) {
- return super.exportXls(request, mdcPlanClose, MdcPlanClose.class, "mdc璁″垝鍋滄満缁存姢琛�");
+ public ModelAndView exportXls(HttpServletRequest request, MdcPlanCloseVo mdcPlanCloseVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ String title = "mdc闈炶鍒掑仠鏈�";
+ if (mdcPlanCloseVo.getCloseType().equals(CommonConstant.STATUS_1)) {
+ title = "mdc璁″垝鍋滄満";
+ }
+ return mdcPlanCloseService.exportXls(userId, mdcPlanCloseVo, title);
}
/**
--
Gitblit v1.9.3