气瓶修改

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

@@ -97,7 +97,13 @@ public class BottleStorage extends BaseBean {
     private Long taskId;
 
     @ApiModelProperty("入库人id")
-    private Long storageUserid;
+    private Long inUserId;
+
+    @ApiModelProperty("入库人姓名")
+    private String inUserName;
+
+    @ApiModelProperty("入库人联系方式")
+    private String inUserPhone;
 
     @ApiModelProperty("气瓶id")
     private Long airBottleId;
@@ -105,9 +111,22 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("气体名称")
     private String airBottleName;
 
+    @ApiModelProperty("气体组分")
+    private String airComponent;
+
     @ApiModelProperty("规格详情")
     private String specificationName;
 
-    @ApiModelProperty("气瓶配置表id")
-    private Long airBottleConfigId;
+    @ApiModelProperty("出库人id")
+    private Long outUserId;
+
+    @ApiModelProperty("出库人姓名")
+    private Long outUserName;
+
+    @ApiModelProperty("出库时间")
+    private Long outTime;
+
+    @ApiModelProperty("出库人联系方式")
+    private Long outUserPhone;
+
 }

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

@@ -1,10 +1,23 @@
 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 org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.service.BottleStorageService;
+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.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 气瓶入库表 前端控制器
@@ -17,4 +30,32 @@ import com.zd.common.core.web.controller.BaseController;
 @RequestMapping("/bottleStorage")
 public class BottleStorageController extends BaseController<BottleStorage> {
 
+    @Resource
+    private BottleStorageService bottleStorageService;
+
+    /**
+     * 查询入库记录列表
+     */
+    @PreAuthorize(hasPermi = "bottle:bottleStorage:list")
+    @GetMapping("/list")
+    @ApiOperation(value = "查询报警记录列表")
+    public TableDataInfo<BottleStorage> list(BottleStorage bottleStorage) {
+        List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 新增入库信息
+     * @param bottleStorage 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "新增入库信息")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.ADD)
+    @Log(title = "RFID标签管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultData<Boolean> add(@RequestBody BottleStorage bottleStorage) {
+
+        return ResultData.result(bottleStorageService.add(bottleStorage));
+    }
 }

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

@@ -1,10 +1,22 @@
 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 org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.service.BottleStorageService;
+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.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 气瓶出库表 前端控制器
@@ -15,6 +27,33 @@ import com.zd.common.core.web.controller.BaseController;
  */
 @RestController
 @RequestMapping("/bottleStorageOut")
-public class BottleStorageOutController extends BaseController<BottleStorageOut> {
+public class BottleStorageOutController extends BaseController<BottleStorage> {
+
+    @Resource
+    private BottleStorageService bottleStorageService;
+
+
+    /**
+     * 查询出库记录列表
+     */
+    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:list")
+    @GetMapping("/list")
+    @ApiOperation(value = "查询出库记录列表")
+    public TableDataInfo<BottleStorage> list(BottleStorage bottleStorage) {
+        List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+        return getDataTable(list);
+    }
 
+    /**
+     * 出库修改
+     * @param bottleStorage 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "出库修改")
+    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:edit")
+    @Log(title = "出库修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultData<Boolean> edit(@RequestBody BottleStorage bottleStorage) {
+        return ResultData.result(bottleStorageService.updateById(bottleStorage));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zd.bottle.service;
 
 import com.zd.bottle.domain.BottleStorage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zd.bottle.domain.RfidTag;
 
 /**
  * <p>
@@ -13,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BottleStorageService extends IService<BottleStorage> {
 
+    /**
+     * 新增入库信息
+     * @param bottleStorage 实体
+     * @return boolean
+     */
+    boolean add(BottleStorage bottleStorage);
+
 }

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

@@ -4,8 +4,12 @@ import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.mapper.BottleStorageMapper;
 import com.zd.bottle.service.BottleStorageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.common.security.service.TokenService;
+import com.zd.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 气瓶入库表 服务实现类
@@ -17,4 +21,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, BottleStorage> implements BottleStorageService {
 
+    @Resource
+    private TokenService tokenService;
+
+
+    /**
+     * 新增入库信息
+     *
+     * @param bottleStorage 实体
+     * @return boolean
+     */
+    @Override
+    public boolean add(BottleStorage bottleStorage) {
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
+        bottleStorage.setInUserId(sysUser.getUserId());
+        bottleStorage.setInUserName(sysUser.getNickName());
+        bottleStorage.setInUserPhone(sysUser.getPhonenumber());
+        return save(bottleStorage);
+    }
 }

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

@@ -19,28 +19,27 @@
         <result column="current_pressure" property="currentPressure" />
         <result column="air_number" property="airNumber" />
         <result column="validate_remark" property="validateRemark" />
-        <result column="rejection_apply_img" property="rejectionApplyImg" />
-        <result column="rejection_apply_remark" property="rejectionApplyRemark" />
-        <result column="rejection_apply_userid" property="rejectionApplyUserid" />
-        <result column="rejection_apply_time" property="rejectionApplyTime" />
-        <result column="rejection_userid" property="rejectionUserid" />
-        <result column="rejection_time" property="rejectionTime" />
         <result column="task_detail_id" property="taskDetailId" />
         <result column="storage_status" property="storageStatus" />
-        <result column="air_status" property="airStatus" />
         <result column="task_id" property="taskId" />
-        <result column="storage_userid" property="storageUserid" />
+        <result column="in_user_id" property="inUserId" />
+        <result column="in_user_name" property="inUserName" />
+        <result column="in_user_phone" property="inUserPhone" />
         <result column="air_bottle_id" property="airBottleId" />
         <result column="air_bottle_name" property="airBottleName" />
+        <result column="air_component" property="airComponent" />
         <result column="specification_name" property="specificationName" />
-        <result column="air_bottle_config_id" property="airBottleConfigId" />
+        <result column="out_user_id" property="outUserId" />
+        <result column="out_user_name" property="outUserName" />
+        <result column="out_user_phone" property="outUserPhone" />
+        <result column="out_time" property="outTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
         create_time,
-        is_handwheel, is_fixed, is_electronic_tag, is_status_sign, is_photo, gas_pressure, validate_start_time, validate_end_time, electronic_tag, is_surplus, current_pressure, air_number, validate_remark, rejection_apply_img, rejection_apply_remark, rejection_apply_userid, rejection_apply_time, rejection_userid, rejection_time, task_detail_id, storage_status, air_status, task_id, storage_userid, air_bottle_id, air_bottle_name, specification_name, air_bottle_config_id
+        is_handwheel, is_fixed, is_electronic_tag, is_status_sign, is_photo, gas_pressure, validate_start_time, validate_end_time, electronic_tag, is_surplus, current_pressure, air_number, validate_remark, rejection_apply_img, rejection_apply_remark, rejection_apply_userid, rejection_apply_time, rejection_userid, rejection_time, task_detail_id, storage_status, task_id, storage_userid, air_bottle_id, air_bottle_name,air_component, specification_name, air_bottle_config_id
     </sql>
 
 </mapper>