Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java
#	zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageMapper.java
#	zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageService.java
#	zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java
#	zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageMapper.xml

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,9 +46,11 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("气表压力")
     private BigDecimal gasPressure;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("检验有效期(开始时间)")
     private Date validateStartTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("检验有效期(结束时间)")
     private Date validateEndTime;
 
@@ -78,6 +81,18 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("入库人联系方式")
     private String inUserPhone;
 
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("实验室名称")
+    private String subjectName;
+
     @ApiModelProperty("气体名称")
     private String airName;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageVo.java

@@ -1,9 +1,12 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.bottle.domain.BottleStorage;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -11,32 +14,14 @@ import java.util.Date;
  * @author Administrator
  */
 @Data
-public class BottleStorageVo {
-
-    private Long id;
-    /** 气瓶编号 */
-    @Excel(name = "气瓶编号")
-    @ApiModelProperty(value = "气瓶编号")
-    private String airNumber;
-    /**
-     * 气瓶名称（冗余字段）
-     */
-    @ApiModelProperty(value = "气瓶名称")
-    private String airName;
-    /** 气瓶规格名称 */
-    @Excel(name = "气体级别/规格")
-    @ApiModelProperty(value = "气瓶规格名称")
-    private String configName;
+@Getter
+@Setter
+public class BottleStorageVo extends BottleStorage {
 
     /** 使用人数 */
     @ApiModelProperty(value = "使用人数")
     private Integer numberPersons;
 
-    /** 当前压力值 */
-    @Excel(name = "当前压力值")
-    @ApiModelProperty(value = "当前压力值")
-    private Double currentPressure;
-
     /**
      * 管理端端查询冗余字段
      */
@@ -44,7 +29,9 @@ public class BottleStorageVo {
     @ApiModelProperty(value = "管理端端查询冗余字段（最后使用时间）")
     private Date lastTime;
 
-    /** 入库状态 1闲置 2使用 3出库 */
-    @ApiModelProperty(value = "入库状态 1空闲 2使用中 3已出库")
-    private Integer storageStatus;
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

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

@@ -6,6 +6,8 @@ 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.vo.BottleStorageVo;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.utils.SecurityUtils;
@@ -32,7 +34,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/bottleStorage")
-public class BottleStorageController extends BaseController<BottleStorage> {
+public class BottleStorageController extends BaseController {
 
     @Resource
     private BottleStorageService bottleStorageService;
@@ -43,8 +45,9 @@ public class BottleStorageController extends BaseController<BottleStorage> {
     @PreAuthorize(hasPermi = "bottle:bottleStorage:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
-    public TableDataInfo<BottleStorage> list(BottleStorage bottleStorage) {
-        List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+    public TableDataInfo<BottleStorageVo> list(BottleStorageVo vo) {
+        // List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+        List<BottleStorageVo> list = bottleStorageService.getListVo(vo);
         return getDataTable(list);
     }
 
@@ -55,15 +58,28 @@ public class BottleStorageController extends BaseController<BottleStorage> {
      * @return Boolean
      */
     @ApiOperation(value = "新增入库信息")
-//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.ADD)
-    @Log(title = "RFID标签管理", businessType = BusinessType.INSERT)
+    @PreAuthorize(hasPermi = "bottle:bottleStorage:add")
+    @Log(title = "新增入库信息", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData<Boolean> add(@RequestBody BottleStorage bottleStorage) {
-
         return ResultData.result(bottleStorageService.add(bottleStorage));
     }
 
 
+    /***
+     * 入库详情
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "入库详情")
+    @PreAuthorize(hasPermi = "bottle:bottleStorage:query")
+    @GetMapping(value = "/{id}")
+    public ResultData<BottleStorage> getInfo(@PathVariable("id") Long id) {
+        return ResultData.success(bottleStorageService.getById(id));
+    }
+
+
+
 
     /**
      * 查询领用气瓶列表(管理端)

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageMapper.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zd.bottle.vo.BottleStorageUseVo;
 
 import java.util.List;
+import com.zd.bottle.vo.BottleStorageVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,6 +19,13 @@ import java.util.List;
  */
 public interface BottleStorageMapper extends BaseMapper<BottleStorage> {
 
+    /***
+     * 气瓶管理列表
+     * @param vo
+     * @return
+     */
+    List<BottleStorageVo> getListVo(BottleStorageVo vo);
+
     /**
      * 查询归还气瓶列表
      * @param bottleStorageUseVo 实体

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

@@ -3,6 +3,9 @@ package com.zd.bottle.service;
 import com.zd.bottle.domain.BottleStorage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.vo.BottleStorageVo;
+
+import java.util.List;
 import com.zd.bottle.vo.BottleStorageUseVo;
 
 import java.util.List;
@@ -24,6 +27,13 @@ public interface BottleStorageService extends IService<BottleStorage> {
      */
     boolean add(BottleStorage bottleStorage);
 
+    /***
+     *
+     * @param vo
+     * @return
+     */
+    List<BottleStorageVo> getListVo(BottleStorageVo vo);
+
 
     /**
      * 查询领用气瓶列表

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

@@ -8,12 +8,16 @@ import com.zd.bottle.mapper.BottleStorageMapper;
 import com.zd.bottle.service.BottleStorageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.vo.BottleStorageUseVo;
+import com.zd.bottle.vo.BottleStorageVo;
 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.List;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -26,11 +30,12 @@ import java.util.List;
 @Service
 public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, BottleStorage> implements BottleStorageService {
 
+    @Autowired
+    private BottleStorageMapper bottleStorageMapper;
+
     @Resource
     private TokenService tokenService;
 
-    @Resource
-    private BottleStorageMapper bottleStorageMapper;
 
     /**
      * 新增入库信息
@@ -44,9 +49,26 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
         bottleStorage.setInUserId(sysUser.getUserId());
         bottleStorage.setInUserName(sysUser.getNickName());
         bottleStorage.setInUserPhone(sysUser.getPhonenumber());
+        bottleStorage.setDeptId(sysUser.getDept().getDeptId());
+        bottleStorage.setDeptName(sysUser.getDept().getDeptName());
+        bottleStorage.setCreateBy(sysUser.getNickName());
+        bottleStorage.setCreateTime(new Date());
+        bottleStorage.setAirNumber(String.valueOf(System.currentTimeMillis() ) );
+
         return save(bottleStorage);
     }
 
+    /***
+     *
+     * @param vo
+     * @return
+     */
+    @Override
+    public List<BottleStorageVo> getListVo(BottleStorageVo vo) {
+        return bottleStorageMapper.getListVo(vo);
+    }
+
+
     @Override
     public List <BottleStorage> receivingGasList(BottleStorage bottleStorage) {
         LambdaQueryWrapper <BottleStorage> wrapper = Wrappers.lambdaQuery();

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

@@ -23,6 +23,10 @@
         <result column="in_user_id" property="inUserId"/>
         <result column="in_user_name" property="inUserName"/>
         <result column="in_user_phone" property="inUserPhone"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="subject_id" property="subjectId"/>
+        <result column="subject_name" property="subjectName"/>
         <result column="air_component" property="airComponent"/>
         <result column="config_name" property="configName"/>
         <result column="create_by" property="createBy"/>
@@ -51,6 +55,10 @@
         in_user_id,
         in_user_name,
         in_user_phone,
+        dept_id,
+        dept_name,
+        subject_id,
+        subject_name,
         air_name,
         air_component,
         config_name,
@@ -60,6 +68,23 @@
         update_time
     </sql>
 
+    <select id="getListVo" resultType="com.zd.bottle.vo.BottleStorageVo"
+            parameterType="com.zd.bottle.vo.BottleStorageVo">
+        select bs.*,
+               (select count(1) from ab_use_record ur where ur.storage_id=bs.id) numberPersons,
+               ( select ur.use_time from ab_use_record ur where ur.storage_id=bs.id ORDER BY use_time desc ) lastTime
+        from ab_bottle_storage bs
+                 LEFT JOIN ab_use_record ur on bs.id=ur.storage_id
+                 where 1=1
+        <if test="searchValue != null">
+            and (bs.electronic_tag like concat('%', #{searchValue}, '%')
+            or bs.air_number like concat('%', #{searchValue}, '%') )
+        </if>
+        <if test="storageStatus != null ">and storage_status = #{storageStatus}</if>
+        <if test="startTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
+        <if test="endTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+    </select>
+
     <select id="returnGas" parameterType="com.zd.bottle.vo.BottleStorageUseVo" resultType="com.zd.bottle.vo.BottleStorageUseVo">
         SELECT bs.*,ur.create_time receivingTime,ur.`user_id` useUserId
         FROM ab_bottle_storage bs