东北大学小程序端气瓶菜单权限恢复

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbBottleTypeController.java

@@ -60,6 +60,32 @@ public class DbBottleTypeController extends AbstractController {
         return ResultData.fail("操作失败");
     }
 
+    /**
+     * app-添加气瓶类型
+     *
+     * @param dbBottleTypeBo
+     * @return
+     */
+    @ApiOperation(value = "app-添加气瓶类型", notes = "参数说明：gasName 气体名称，level 级别，size 规格，gasComposition 气体成分 ")
+    @Log(title = "app-添加气瓶类型", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/appAdd")
+    public ResultData appAdd(@RequestBody DbBottleTypeBo dbBottleTypeBo) {
+        //参数检查
+        paramCheck.notNull(dbBottleTypeBo).strNotEmpty(dbBottleTypeBo.getGasName()).notNull(dbBottleTypeBo.getLevel()).notNull(dbBottleTypeBo.getSize());
+        //验证是否重复
+        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().eq(DbBottleType::getGasName, dbBottleTypeBo.getGasName()).eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
+        if (count > 0) {
+            return ResultData.fail("已存在相同气瓶类型");
+        }
+        DbBottleType dbBottle = new DbBottleType();
+        BeanUtils.copyProperties(dbBottleTypeBo, dbBottle);
+        dbBottle.setIsDeleted(Boolean.FALSE);
+        if (dbBottleTypeService.save(dbBottle)) {
+            return ResultData.success("操作成功");
+        }
+        return ResultData.fail("操作失败");
+    }
+
 
     /**
      * 更新气瓶类型
@@ -88,6 +114,31 @@ public class DbBottleTypeController extends AbstractController {
     }
 
     /**
+     * app-更新气瓶类型
+     *
+     * @Param [dbBottleBo]
+     * @Return com.zd.model.domain.ResultData
+     **/
+    @ApiOperation(value = "app-更新气瓶类型", notes = "参数说明：id 必填，gasName 气体名称，level 级别，size 规格，gasComposition 气体成分 ")
+    @Log(title = "app-更新气瓶类型", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/appUpdate")
+    public ResultData appUpdate(@RequestBody DbBottleTypeBo dbBottleTypeBo) {
+        //参数检查
+        paramCheck.notNull(dbBottleTypeBo).notNull(dbBottleTypeBo.getId()).strNotEmpty(dbBottleTypeBo.getGasName()).notNull(dbBottleTypeBo.getLevel()).notNull(dbBottleTypeBo.getSize());
+        //验证是否重复
+        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().ne(DbBottleType::getId, dbBottleTypeBo.getId()).eq(DbBottleType::getGasName, dbBottleTypeBo.getGasName()).eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
+        if (count > 0) {
+            return ResultData.fail("已存在相同气瓶类型");
+        }
+        DbBottleType dbBottle = new DbBottleType();
+        BeanUtils.copyProperties(dbBottleTypeBo, dbBottle);
+        if (dbBottleTypeService.saveOrUpdate(dbBottle)) {
+            return ResultData.success("操作成功");
+        }
+        return ResultData.fail("操作失败");
+    }
+
+    /**
      * 通过ID获取气瓶类型详情
      *
      * @param id
@@ -103,6 +154,20 @@ public class DbBottleTypeController extends AbstractController {
     }
 
     /**
+     * app-通过ID获取气瓶类型详情
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "app-通过ID获取气瓶类型详情", notes = "参数说明：id 必填")
+    @GetMapping(value = "/appFindById")
+    public ResultData appFind(@RequestParam("id") Long id) {
+        paramCheck.notNull(id);
+        DbBottleType dbBottle = dbBottleTypeService.getById(id);
+        return ResultData.success(dbBottle);
+    }
+
+    /**
      * 获取气瓶类型list
      *
      * @param dbBottleTypeBo
@@ -125,6 +190,27 @@ public class DbBottleTypeController extends AbstractController {
     }
 
     /**
+     * app-获取气瓶类型list
+     *
+     * @param dbBottleTypeBo
+     * @return
+     */
+    @ApiOperation(value = "app-获取气瓶类型list", notes = "参数说明：searchValue 关键字")
+    @PostMapping(value = "/appList")
+    public ResultData appList(@RequestBody DbBottleTypeBo dbBottleTypeBo) {
+        //查询条件
+        LambdaQueryWrapper<DbBottleType> queryWrapper = new LambdaQueryWrapper<>();
+        //gasName条件
+        if (StringUtils.isNotBlank(dbBottleTypeBo.getSearchValue())) {
+            queryWrapper.like(DbBottleType::getGasName, dbBottleTypeBo.getSearchValue());
+        }
+        //过滤物理删除数据及倒叙
+        queryWrapper.eq(DbBottleType::getIsDeleted, Boolean.FALSE).orderByDesc(DbBottleType::getId);
+        IPage<DbBottleType> page = dbBottleTypeService.page(PageUtil.getQuery(dbBottleTypeBo.getPageNum(), dbBottleTypeBo.getPageSize()), queryWrapper);
+        return ResultData.success(page);
+    }
+
+    /**
      * 通过Id删除气瓶类型
      *
      * @param dbBottleTypeBo
@@ -143,4 +229,23 @@ public class DbBottleTypeController extends AbstractController {
         return ResultData.fail("操作失败");
     }
 
+    /**
+     * app-通过Id删除气瓶类型
+     *
+     * @param dbBottleTypeBo
+     * @return
+     */
+    @ApiOperation(value = "app-通过Id删除气瓶类型", notes = "参数说明：id 必填")
+    @Log(title = "app-通过Id删除气瓶类型", businessType = BusinessType.DELETE)
+    @PreAuthorize(hasPermi = PerPrefix.DB_BOTTLETYPE + PerFun.REMOVE)
+    @PostMapping(value = "/appDelete")
+    public ResultData appDelete(@RequestBody DbBottleTypeBo dbBottleTypeBo) {
+        paramCheck.notNull(dbBottleTypeBo).notNull(dbBottleTypeBo.getId());
+        boolean bool = dbBottleTypeService.removeById(dbBottleTypeBo.getId());
+        if (bool) {
+            return ResultData.success("操作成功");
+        }
+        return ResultData.fail("操作失败");
+    }
+
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbInOutRecordController.java

@@ -49,6 +49,20 @@ public class DbInOutRecordController extends AbstractController {
     }
 
     /**
+     * app-通过ID获取出入库详情
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "app-通过ID获取出入库详情", notes = "参数说明：id 必填")
+    @GetMapping(value = "/appFindById")
+    public ResultData appFind(@RequestParam("id") Long id) {
+        paramCheck.notNull(id);
+        DbInOutRecord dbInOutRecord = dbInOutRecordService.getById(id);
+        return ResultData.success(dbInOutRecord);
+    }
+
+    /**
      * 获取出入库list
      *
      * @param dbInOutRecordParam
@@ -81,4 +95,37 @@ public class DbInOutRecordController extends AbstractController {
         IPage<DbInOutRecord> result = dbInOutRecordService.page(PageUtil.getQuery(dbInOutRecordParam.getPageNum(), dbInOutRecordParam.getPageSize()), queryWrapper);
         return ResultData.success(result);
     }
+
+    /**
+     * app-获取出入库list
+     *
+     * @param dbInOutRecordParam
+     * @return
+     */
+    @ApiOperation(value = "获取出入库list", notes = "参数说明：type 类型（1入库 2出库） 必填, searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
+    @PostMapping(value = "/appList")
+    public ResultData appList(@RequestBody DbInOutRecordParam dbInOutRecordParam) {
+        //查询条件
+        LambdaQueryWrapper<DbInOutRecord> queryWrapper = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(dbInOutRecordParam.getType())) {
+            queryWrapper.eq(DbInOutRecord::getType, dbInOutRecordParam.getType());
+        }
+        if (Objects.nonNull(dbInOutRecordParam.getCollegeId())) {
+            queryWrapper.eq(DbInOutRecord::getCollegeId, dbInOutRecordParam.getCollegeId());
+        }
+        if (Objects.nonNull(dbInOutRecordParam.getStartTime()) && Objects.nonNull(dbInOutRecordParam.getEndTime())) {
+            queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime().atStartOfDay(), dbInOutRecordParam.getEndTime().atTime(LocalTime.MAX));
+//            queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime(), dbInOutRecordParam.getEndTime());
+        }
+        //操作人 联系电话 气瓶编号 气瓶名称
+        if (StringUtils.isNotBlank(dbInOutRecordParam.getSearchValue())) {
+            queryWrapper.and(wrapper -> {
+                wrapper.like(DbInOutRecord::getGasName, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getOperator, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getPhone, dbInOutRecordParam.getSearchValue());
+            });
+        }
+        //倒叙
+        queryWrapper.orderByDesc(DbInOutRecord::getId);
+        IPage<DbInOutRecord> result = dbInOutRecordService.page(PageUtil.getQuery(dbInOutRecordParam.getPageNum(), dbInOutRecordParam.getPageSize()), queryWrapper);
+        return ResultData.success(result);
+    }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -169,7 +169,6 @@ public class DbStockController extends AbstractController {
      **/
     @ApiOperation(value = "更新库存信息", notes = "参数说明：id 必填，gasName 气体名称，level 级别，size 规格，gasComposition 气体成分,bottleColour 气瓶颜色,handwheel 手轮（0否 1是）,fixed 固定（0否 1是）,statusLabel 状态标牌（0否 1是），electronicTag 电子标签（0否 1是）,gasPressure 气体压力,validPeriod 有效期限,beaconTag 信标标签,subjectId 实验室id,subjectName 实验室名称,remark 备注 ")
     @Log(title = "更新库存信息", businessType = BusinessType.UPDATE)
-    @PreAuthorize(hasPermi = PerPrefix.DB_STOCK + PerFun.EDIT)
     @PostMapping(value = "/update")
     public ResultData update(@RequestBody DbStockBo dbStockBo) {
         //参数检查
@@ -222,7 +221,6 @@ public class DbStockController extends AbstractController {
      * @return
      */
     @ApiOperation(value = "通过ID获取库存详情", notes = "参数说明：库存id 必填")
-    @PreAuthorize(hasPermi = PerPrefix.DB_STOCK + PerFun.QUERY)
     @GetMapping(value = "/findById")
     public ResultData find(@RequestParam("id") Long id) {
         paramCheck.notNull(id);
@@ -270,6 +268,35 @@ public class DbStockController extends AbstractController {
     }
 
     /**
+     * app-获取库存list
+     *
+     * @param dbStockParam
+     * @return
+     */
+    @ApiOperation(value = "app-获取库存list", notes = "参数说明：searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
+    @PostMapping(value = "/appList")
+    public ResultData appList(@RequestBody DbStockParam dbStockParam) {
+        //查询条件
+        LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper<>();
+        //气瓶名称 实验室名称
+        if (StringUtils.isNotBlank(dbStockParam.getSearchValue())) {
+            queryWrapper.and(wrapper -> {
+                wrapper.like(DbStock::getGasName, dbStockParam.getSearchValue()).or().like(DbStock::getSubjectName, dbStockParam.getSearchValue()).or().like(DbStock::getRoomNum, dbStockParam.getSearchValue());
+            });
+        }
+        if (Objects.nonNull(dbStockParam.getCollegeId())) {
+            queryWrapper.eq(DbStock::getCollegeId, dbStockParam.getCollegeId());
+        }
+        if (Objects.nonNull(dbStockParam.getStartTime()) && Objects.nonNull(dbStockParam.getEndTime())) {
+            queryWrapper.between(DbStock::getCreateTime, dbStockParam.getStartTime().atStartOfDay(), dbStockParam.getEndTime().atTime(LocalTime.MAX));
+        }
+        //倒叙
+        queryWrapper.orderByDesc(DbStock::getId);
+        IPage<DbStock> result = dbStockService.page(PageUtil.getQuery(dbStockParam.getPageNum(), dbStockParam.getPageSize()), queryWrapper);
+        return ResultData.success(result);
+    }
+
+    /**
      * 通过信标查询库信息
      *
      * @param BeaconTag

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbUsageRecordController.java

@@ -55,7 +55,6 @@ public class DbUsageRecordController extends AbstractController {
      */
     @ApiOperation(value = "添加使用记录", notes = "参数说明：")
     @Log(title = "添加使用记录", businessType = BusinessType.INSERT)
-    @PreAuthorize(hasPermi = PerPrefix.DB_USAGERECORD + PerFun.ADD)
     @PostMapping(value = "/add")
     public ResultData add(@RequestBody DbUsageRecordBo dbUsageRecordBo) {
         //参数检查
@@ -88,7 +87,6 @@ public class DbUsageRecordController extends AbstractController {
      **/
     @ApiOperation(value = "更新使用记录", notes = "参数说明：id 必填")
     @Log(title = "更新使用记录", businessType = BusinessType.UPDATE)
-    @PreAuthorize(hasPermi = PerPrefix.DB_USAGERECORD + PerFun.EDIT)
     @PostMapping(value = "/update")
     public ResultData update(@RequestBody DbUsageRecordBo dbUsageRecordBo) {
         //参数检查
@@ -117,6 +115,20 @@ public class DbUsageRecordController extends AbstractController {
     }
 
     /**
+     * app-通过ID获取使用详情
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "app-通过ID获取使用详情", notes = "参数说明：id 必填")
+    @GetMapping(value = "/appFindById")
+    public ResultData appFind(@RequestParam("id") Long id) {
+        paramCheck.notNull(id);
+        DbUsageRecord dbUsageRecord = dbUsageRecordService.getById(id);
+        return ResultData.success(dbUsageRecord);
+    }
+
+    /**
      * 获取使用记录列表
      *
      * @param dbUsageRecordBo
@@ -147,6 +159,35 @@ public class DbUsageRecordController extends AbstractController {
     }
 
     /**
+     * app-获取使用记录列表
+     *
+     * @param dbUsageRecordBo
+     * @return
+     */
+    @ApiOperation(value = "app-获取使用记录列表", notes = "参数说明：searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
+    @PostMapping(value = "/appList")
+    public ResultData appList(@RequestBody DbUsageRecordBo dbUsageRecordBo) {
+        //查询条件
+        LambdaQueryWrapper<DbUsageRecord> queryWrapper = new LambdaQueryWrapper<>();
+        //气瓶编号 气瓶名称 实验室名称
+        if (StringUtils.isNotBlank(dbUsageRecordBo.getSearchValue())) {
+            queryWrapper.and(wrapper ->{
+                wrapper.like(DbUsageRecord::getGasName, dbUsageRecordBo.getSearchValue()).or().like(DbUsageRecord::getOperator, dbUsageRecordBo.getSearchValue());
+            });
+        }
+        if (Objects.nonNull(dbUsageRecordBo.getCollegeId())) {
+            queryWrapper.eq(DbUsageRecord::getCollegeId, dbUsageRecordBo.getCollegeId());
+        }
+        if (Objects.nonNull(dbUsageRecordBo.getStartTime()) && Objects.nonNull(dbUsageRecordBo.getEndTime())) {
+            queryWrapper.between(DbUsageRecord::getUsageStartTime, dbUsageRecordBo.getStartTime().atStartOfDay(), dbUsageRecordBo.getEndTime().atTime(LocalTime.MAX));
+        }
+        //过滤物理删除数据及倒叙
+        queryWrapper.orderByDesc(DbUsageRecord::getId);
+        IPage<DbUsageRecord> result = dbUsageRecordService.page(PageUtil.getQuery(dbUsageRecordBo.getPageNum(), dbUsageRecordBo.getPageSize()), queryWrapper);
+        return ResultData.success(result);
+    }
+
+    /**
      * 通过Id删除使用记录
      *
      * @param dbUsageRecordBo