Merge branch 'refs/heads/master' into herb

baoshiwei

2024-12-11 7c585586e9bea943161676bd9d127e81123891c3

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderTrendController.java

old mode 100644
new mode 100755
@@ -1,172 +1,172 @@
package org.jeecg.modules.dry.controller;

import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.DryOrderTrend;
import org.jeecg.modules.dry.service.IDryOrderTrendService;

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.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/dryOrderTrend")
@Slf4j
public class DryOrderTrendController extends JeecgController<DryOrderTrend, IDryOrderTrendService> {
   @Autowired
   private IDryOrderTrendService dryOrderTrendService;

   /**
    * 分页列表查询
    *
    * @param dryOrderTrend
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "批次过程趋势-分页列表查询")
   @ApiOperation(value="批次过程趋势-分页列表查询", notes="批次过程趋势-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<DryOrderTrend>> queryPageList(DryOrderTrend dryOrderTrend,
                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                         HttpServletRequest req) {
      //------------------------------------------------------------------------------------------------
      //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
      if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
         dryOrderTrend.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
      }
      //------------------------------------------------------------------------------------------------
      QueryWrapper<DryOrderTrend> queryWrapper = QueryGenerator.initQueryWrapper(dryOrderTrend, req.getParameterMap());
      Page<DryOrderTrend> page = new Page<DryOrderTrend>(pageNo, pageSize);
      IPage<DryOrderTrend> pageList = dryOrderTrendService.page(page, queryWrapper);
      return Result.OK(pageList);
   }

   /**
    *   添加
    *
    * @param dryOrderTrend
    * @return
    */
   @AutoLog(value = "批次过程趋势-添加")
   @ApiOperation(value="批次过程趋势-添加", notes="批次过程趋势-添加")
   @RequiresPermissions("dry:dry_order_trend:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody DryOrderTrend dryOrderTrend) {
      dryOrderTrendService.save(dryOrderTrend);
      return Result.OK("添加成功！");
   }

   /**
    *  编辑
    *
    * @param dryOrderTrend
    * @return
    */
   @AutoLog(value = "批次过程趋势-编辑")
   @ApiOperation(value="批次过程趋势-编辑", notes="批次过程趋势-编辑")
   @RequiresPermissions("dry:dry_order_trend:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody DryOrderTrend dryOrderTrend) {
      dryOrderTrendService.updateById(dryOrderTrend);
      return Result.OK("编辑成功!");
   }

   /**
    *   通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "批次过程趋势-通过id删除")
   @ApiOperation(value="批次过程趋势-通过id删除", notes="批次过程趋势-通过id删除")
   @RequiresPermissions("dry:dry_order_trend:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      dryOrderTrendService.removeById(id);
      return Result.OK("删除成功!");
   }

   /**
    *  批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "批次过程趋势-批量删除")
   @ApiOperation(value="批次过程趋势-批量删除", notes="批次过程趋势-批量删除")
   @RequiresPermissions("dry:dry_order_trend:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.dryOrderTrendService.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<DryOrderTrend> queryById(@RequestParam(name="id",required=true) String id) {
      DryOrderTrend dryOrderTrend = dryOrderTrendService.getById(id);
      if(dryOrderTrend ==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(dryOrderTrend);
   }

    /**
    * 导出excel
    *
    * @param request
    * @param dryOrderTrend
    */
    @RequiresPermissions("dry:dry_order_trend:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, DryOrderTrend dryOrderTrend) {
        return super.exportXls(request, dryOrderTrend, DryOrderTrend.class, "批次过程趋势");
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    @RequiresPermissions("dry:dry_order_trend:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, DryOrderTrend.class);
    }

}
//package org.jeecg.modules.dry.controller;
//
//import java.util.Arrays;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//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.DryOrderTrend;
//import org.jeecg.modules.dry.service.IDryOrderTrendService;
//
//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.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/dryOrderTrend")
//@Slf4j
//public class DryOrderTrendController extends JeecgController<DryOrderTrend, IDryOrderTrendService> {
//   @Autowired
//   private IDryOrderTrendService dryOrderTrendService;
//
//   /**
//    * 分页列表查询
//    *
//    * @param dryOrderTrend
//    * @param pageNo
//    * @param pageSize
//    * @param req
//    * @return
//    */
//   //@AutoLog(value = "工单过程趋势-分页列表查询")
//   @ApiOperation(value="工单过程趋势-分页列表查询", notes="工单过程趋势-分页列表查询")
//   @GetMapping(value = "/list")
//   public Result<IPage<DryOrderTrend>> queryPageList(DryOrderTrend dryOrderTrend,
//                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
//                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
//                                         HttpServletRequest req) {
//      //------------------------------------------------------------------------------------------------
//      //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
//      if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
//         dryOrderTrend.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
//      }
//      //------------------------------------------------------------------------------------------------
//      QueryWrapper<DryOrderTrend> queryWrapper = QueryGenerator.initQueryWrapper(dryOrderTrend, req.getParameterMap());
//      Page<DryOrderTrend> page = new Page<DryOrderTrend>(pageNo, pageSize);
//      IPage<DryOrderTrend> pageList = dryOrderTrendService.page(page, queryWrapper);
//      return Result.OK(pageList);
//   }
//
//   /**
//    *   添加
//    *
//    * @param dryOrderTrend
//    * @return
//    */
//   @AutoLog(value = "工单过程趋势-添加")
//   @ApiOperation(value="工单过程趋势-添加", notes="工单过程趋势-添加")
//   @RequiresPermissions("dry:dry_order_trend:add")
//   @PostMapping(value = "/add")
//   public Result<String> add(@RequestBody DryOrderTrend dryOrderTrend) {
//      dryOrderTrendService.save(dryOrderTrend);
//      return Result.OK("添加成功！");
//   }
//
//   /**
//    *  编辑
//    *
//    * @param dryOrderTrend
//    * @return
//    */
//   @AutoLog(value = "工单过程趋势-编辑")
//   @ApiOperation(value="工单过程趋势-编辑", notes="工单过程趋势-编辑")
//   @RequiresPermissions("dry:dry_order_trend:edit")
//   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
//   public Result<String> edit(@RequestBody DryOrderTrend dryOrderTrend) {
//      dryOrderTrendService.updateById(dryOrderTrend);
//      return Result.OK("编辑成功!");
//   }
//
//   /**
//    *   通过id删除
//    *
//    * @param id
//    * @return
//    */
//   @AutoLog(value = "工单过程趋势-通过id删除")
//   @ApiOperation(value="工单过程趋势-通过id删除", notes="工单过程趋势-通过id删除")
//   @RequiresPermissions("dry:dry_order_trend:delete")
//   @DeleteMapping(value = "/delete")
//   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
//      dryOrderTrendService.removeById(id);
//      return Result.OK("删除成功!");
//   }
//
//   /**
//    *  批量删除
//    *
//    * @param ids
//    * @return
//    */
//   @AutoLog(value = "工单过程趋势-批量删除")
//   @ApiOperation(value="工单过程趋势-批量删除", notes="工单过程趋势-批量删除")
//   @RequiresPermissions("dry:dry_order_trend:deleteBatch")
//   @DeleteMapping(value = "/deleteBatch")
//   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
//      this.dryOrderTrendService.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<DryOrderTrend> queryById(@RequestParam(name="id",required=true) String id) {
//      DryOrderTrend dryOrderTrend = dryOrderTrendService.getById(id);
//      if(dryOrderTrend ==null) {
//         return Result.error("未找到对应数据");
//      }
//      return Result.OK(dryOrderTrend);
//   }
//
//    /**
//    * 导出excel
//    *
//    * @param request
//    * @param dryOrderTrend
//    */
//    @RequiresPermissions("dry:dry_order_trend:exportXls")
//    @RequestMapping(value = "/exportXls")
//    public ModelAndView exportXls(HttpServletRequest request, DryOrderTrend dryOrderTrend) {
//        return super.exportXls(request, dryOrderTrend, DryOrderTrend.class, "工单过程趋势");
//    }
//
//    /**
//      * 通过excel导入数据
//    *
//    * @param request
//    * @param response
//    * @return
//    */
//    @RequiresPermissions("dry:dry_order_trend:importExcel")
//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
//        return super.importExcel(request, response, DryOrderTrend.class);
//    }
//
//}