气瓶修改

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -702,6 +702,17 @@ public class PerPrefix {
     /**   ================================================气瓶申请流程的权限=====================================     */
     public static final String QP_USEGASAPPLY = "bottle:usegasapply:";
 
+
+    /***
+     * 气瓶入库-2版
+     */
+    public static final String BOTTLE_BOTTLESTORAGE= "bottle:bottleStorage:";
+
+    /***
+     * 气瓶出库-2版
+     */
+    public static final String BOTTLE_BOTTLESTORAGEOUT= "bottle:bottleStorageOut:";
+
     /*****************************智能门锁******************************/
     public static final String SMARTLOCK_OPENDOORAPPLY = "smartlock:openDoorApply:";
 }

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -33,6 +33,12 @@ public class BottleStorageOut extends BaseBean{
     @ApiModelProperty("操作人Id")
     private Long applyUserid;
 
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
     @ApiModelProperty("联系方式")
     private String phone;
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -1,28 +1,22 @@
 package com.zd.bottle.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zd.bottle.domain.AlarmRecord;
+
 import com.zd.bottle.domain.BottleStorage;
-import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.bottle.vo.UseRecordVo;
+import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.bottle.vo.BottleStorageUseVo;
-import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.bottle.vo.BottleStorageVo;
-import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.ApiOperation;
-import org.apache.hadoop.security.SecurityUtil;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
@@ -52,7 +46,8 @@ public class BottleStorageController extends BaseController {
     /**
      * 查询入库记录列表
      */
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:list")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:list")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
     public TableDataInfo<BottleStorageVo> list(BottleStorageVo vo) {
@@ -68,7 +63,8 @@ public class BottleStorageController extends BaseController {
      * @return Boolean
      */
     @ApiOperation(value = "新增入库信息")
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:add")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:add")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.ADD)
     @Log(title = "新增入库信息", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData<Boolean> add(@RequestBody BottleStorage bottleStorage) {
@@ -82,7 +78,8 @@ public class BottleStorageController extends BaseController {
      * @return
      */
     @ApiOperation(value = "入库详情")
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:query")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:query")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         Map<String,Object> map = new HashMap<String,Object>();

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageOutController.java

@@ -1,10 +1,10 @@
 package com.zd.bottle.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageOut;
-import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.service.BottleStorageService;
+import com.zd.bottle.service.BottleStorageOutService;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
@@ -27,20 +27,21 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/bottleStorageOut")
-public class BottleStorageOutController extends BaseController<BottleStorage> {
+public class BottleStorageOutController extends BaseController<BottleStorageOut> {
 
     @Resource
-    private BottleStorageService bottleStorageService;
+    private BottleStorageOutService outService;
 
 
     /**
      * 查询出库记录列表
      */
-    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:list")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorageOut:list")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询出库记录列表")
-    public TableDataInfo<BottleStorage> list(BottleStorage bottleStorage) {
-        List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+    public TableDataInfo<BottleStorageOut> list(BottleStorageOut bottleStorage) {
+        List<BottleStorageOut> list = outService.list(new LambdaQueryWrapper<>(bottleStorage));
         return getDataTable(list);
     }
 
@@ -50,10 +51,26 @@ public class BottleStorageOutController extends BaseController<BottleStorage> {
      * @return Boolean
      */
     @ApiOperation(value = "出库修改")
-    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:edit")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorageOut:edit")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.EDIT)
     @Log(title = "出库修改", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData<Boolean> edit(@RequestBody BottleStorage bottleStorage) {
-        return ResultData.result(bottleStorageService.updateById(bottleStorage));
+    public ResultData<Boolean> edit(@RequestBody BottleStorageOut bottleStorage) {
+        return ResultData.result(outService.updateById(bottleStorage));
+    }
+
+    /**
+     * 新增出库
+     * @param bottleStorageOut 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "新增出库")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.ADD)
+    @Log(title = "新增出库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultData<Boolean> add(@RequestBody BottleStorageOut bottleStorageOut) {
+        // storageId  入库表id
+        // pressure 出库气压
+        return ResultData.result(outService.add(bottleStorageOut));
     }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageOutService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BottleStorageOutService extends IService<BottleStorageOut> {
 
+    boolean add(BottleStorageOut bottleStorageOut);
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageOutServiceImpl.java

@@ -1,11 +1,21 @@
 package com.zd.bottle.service.impl;
 
+import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageOut;
 import com.zd.bottle.mapper.BottleStorageOutMapper;
 import com.zd.bottle.service.BottleStorageOutService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.bottle.service.BottleStorageService;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.security.service.TokenService;
+import com.zd.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 气瓶出库表 服务实现类
@@ -17,4 +27,34 @@ import org.springframework.stereotype.Service;
 @Service
 public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMapper, BottleStorageOut> implements BottleStorageOutService {
 
+    @Resource
+    private BottleStorageService bottleStorageService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    public boolean add(BottleStorageOut bottleStorageOut) {
+        if(StringUtils.isNull(bottleStorageOut.getStorageId())){
+            throw new ServiceException("入库ID不能为空。");
+        }
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
+        //查询入库信息
+        BottleStorage bottleStorage =  bottleStorageService.getById(bottleStorageOut.getStorageId());
+        if(bottleStorage.getStorageStatus()==3){
+            throw new ServiceException("该条记录已出库。");
+        }
+        //出库状态
+        bottleStorage.setStorageStatus(3);
+        //刷新入库状态
+        bottleStorageService.updateById(bottleStorage);
+
+        bottleStorageOut.setDeptId(sysUser.getDept().getDeptId());
+        bottleStorageOut.setDeptName(sysUser.getDept().getDeptName());
+        bottleStorageOut.setApplyUserid(sysUser.getUserId());
+        bottleStorageOut.setApplyUserName(sysUser.getUserName());
+        bottleStorageOut.setPhone(sysUser.getPhonenumber());
+        bottleStorageOut.setCreateTime(new Date());
+        return save(bottleStorageOut);
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java

@@ -36,7 +36,7 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
     @Autowired
     private BottleStorageMapper bottleStorageMapper;
 
-    @Resource
+    @Autowired
     private TokenService tokenService;
 
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageOutMapper.xml

@@ -8,6 +8,8 @@
         <result column="create_time" property="createTime" />
         <result column="apply_user_name" property="applyUserName" />
         <result column="apply_userid" property="applyUserid" />
+        <result column="dept_id" property="deptId" />
+        <result column="apply_userid" property="applyUserid" />
         <result column="phone" property="phone" />
         <result column="storage_id" property="storageId" />
         <result column="pressure" property="pressure" />