From c2fccb01b972176dc3da5a497b5e904025e9e98d Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 15:06:51 +0800
Subject: [PATCH] Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java | 188 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 188 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
new file mode 100644
index 0000000..8d4de43
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
@@ -0,0 +1,188 @@
+package org.jeecg.modules.dry.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.modules.dry.entity.DryOrder;
+import org.jeecg.modules.dry.service.IDryOrderService;
+
+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.jeecg.modules.dry.vo.DryOrderVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 骞茬嚗宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2023-03-08
+ * @Version: V1.0
+ */
+@Api(tags="骞茬嚗宸ュ崟")
+@RestController
+@RequestMapping("/dry/dryOrder")
+@Slf4j
+public class DryOrderController extends JeecgController<DryOrder, IDryOrderService> {
+ @Autowired
+ private IDryOrderService dryOrderService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param dryOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<DryOrder>> queryPageList(DryOrder dryOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ //------------------------------------------------------------------------------------------------
+ //鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
+ if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
+ dryOrder.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
+ }
+ //------------------------------------------------------------------------------------------------
+ QueryWrapper<DryOrder> queryWrapper = QueryGenerator.initQueryWrapper(dryOrder, req.getParameterMap());
+ Page<DryOrder> page = new Page<DryOrder>(pageNo, pageSize);
+ IPage<DryOrder> pageList = dryOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+ @ApiOperation(value="鏈堢敓浜ф儏鍐垫瑙�", notes="")
+ @GetMapping(value = "/monthOverview")
+ public Result<?> queryMonthOverview(@RequestParam(name="month") String month) {
+ int tenantId = oConvertUtils.getInt(TenantContext.getTenant(),0);
+ List<String> list = dryOrderService.queryMonthOverview(month, tenantId);
+ return Result.ok(list);
+ }
+
+
+ /**
+ * 娣诲姞
+ *
+ * @param dryOrder
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-娣诲姞")
+ @ApiOperation(value="骞茬嚗宸ュ崟-娣诲姞", notes="骞茬嚗宸ュ崟-娣诲姞")
+ @RequiresPermissions("dry:dry_order:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody DryOrder dryOrder) {
+ dryOrderService.save(dryOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param dryOrder
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-缂栬緫")
+ @ApiOperation(value="骞茬嚗宸ュ崟-缂栬緫", notes="骞茬嚗宸ュ崟-缂栬緫")
+ @RequiresPermissions("dry:dry_order:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody DryOrder dryOrder) {
+ dryOrderService.updateById(dryOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎", notes="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
+ @RequiresPermissions("dry:dry_order:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ dryOrderService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎", notes="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
+ @RequiresPermissions("dry:dry_order:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.dryOrderService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ", notes="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<DryOrder> queryById(@RequestParam(name="id",required=true) String id) {
+ DryOrder dryOrder = dryOrderService.getById(id);
+ if(dryOrder ==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(dryOrder);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param dryOrder
+ */
+ @RequiresPermissions("dry:dry_order:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, DryOrder dryOrder) {
+ return super.exportXls(request, dryOrder, DryOrder.class, "骞茬嚗宸ュ崟");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequiresPermissions("dry:dry_order:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, DryOrder.class);
+ }
+
+
+}
--
Gitblit v1.9.3