气瓶信息统计

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

@@ -735,6 +735,11 @@ public class PerPrefix {
      */
     public static final String BOTTLE_BOTTLESTORAGEOUT= "bottle:bottleStorageOut:";
 
+    /***
+     * 气瓶信息统计-2版
+     */
+    public static final String BOTTLE_STATISTICS= "bottle:statistics:";
+
     /*****************************智能门锁******************************/
     public static final String SMARTLOCK_OPENDOORAPPLY = "smartlock:openDoorApply:";
 }

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

@@ -1,9 +1,11 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,13 +23,41 @@ import java.util.Date;
  * @author hanson
  * @since 2022-09-08
  */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 @ApiModel(value = "BottleStorage对象", description = "气瓶入库表")
 @EqualsAndHashCode(callSuper = true)
 public class BottleStorage extends BaseBean {
 
+    @Excel(name = "操作人")
+    @ApiModelProperty("入库人姓名")
+    private String userName;
+
+    @Excel(name = "联系方式")
+    @ApiModelProperty("入库人联系方式")
+    private String userPhone;
+
+    @Excel(name = "标签吗")
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
+
+    @Excel(name = "气瓶编号")
+    @ApiModelProperty("气瓶编号")
+    private String airNumber;
+
+    @Excel(name = "气体名称")
+    @ApiModelProperty("气体名称")
+    private String airName;
+
+    @Excel(name = "气瓶规格")
+    @ApiModelProperty("规格详情")
+    private String configName;
+
+    @Excel(name = "入库时间" ,type = Excel.Type.ALL,dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
     @ApiModelProperty("是否有手轮 1有 0无")
     private Short isHandwheel;
 
@@ -46,6 +76,9 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("气表压力")
     private BigDecimal gasPressure;
 
+    @ApiModelProperty("最低气压值")
+    private BigDecimal minPressure;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("检验有效期(开始时间)")
     private Date validateStartTime;
@@ -54,30 +87,18 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("检验有效期(结束时间)")
     private Date validateEndTime;
 
-    @ApiModelProperty("电子标签")
-    private String electronicTag;
-
     @ApiModelProperty("余量是否符合 0符合  1不符合")
     private Integer isSurplus;
 
     @ApiModelProperty("当前压力值")
     private BigDecimal currentPressure;
 
-    @ApiModelProperty("气瓶编号")
-    private String airNumber;
-
     @ApiModelProperty("验收备注")
     private String validateRemark;
 
     @ApiModelProperty("入库状态 1闲置 2使用 3出库")
     private Integer storageStatus;
 
-    @ApiModelProperty("入库人姓名")
-    private String userName;
-
-    @ApiModelProperty("入库人联系方式")
-    private String userPhone;
-
     @ApiModelProperty("部门名称")
     private String deptName;
 
@@ -87,13 +108,20 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("实验室名称")
     private String subjectName;
 
-    @ApiModelProperty("气体名称")
-    private String airName;
-
     @ApiModelProperty("气体组分")
     private String airComponent;
 
-    @ApiModelProperty("规格详情")
-    private String configName;
+
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
 
 }

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

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,14 +27,19 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class BottleStorageOut extends BaseBean{
 
+    @Excel(name = "操作人")
     @ApiModelProperty("操作人")
     private String userName;
 
+    @Excel(name = "联系方式")
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+
     @ApiModelProperty("部门名称")
     private String deptName;
 
-    @ApiModelProperty("联系方式")
-    private String phone;
+
 
     @ApiModelProperty("入库表id")
     private Long storageId;

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

@@ -1,13 +1,18 @@
 package com.zd.bottle.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.utils.poi.ExcelUtil;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.common.core.utils.SecurityUtils;
@@ -18,10 +23,16 @@ import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,10 +50,10 @@ import java.util.Map;
 @RequestMapping("/bottleStorage")
 public class BottleStorageController extends BaseController<BottleStorage> {
 
-    @Resource
+    @Autowired
     private BottleStorageService bottleStorageService;
 
-    @Resource
+    @Autowired
     private UseRecordService useRecordService;
 
     /**
@@ -93,8 +104,6 @@ public class BottleStorageController extends BaseController<BottleStorage> {
     }
 
 
-
-
     /**
      * 查询领用气瓶列表(管理端)
      */

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

@@ -12,6 +12,7 @@ import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
@@ -31,7 +32,7 @@ import java.util.List;
 @RequestMapping("/bottleStorageOut")
 public class BottleStorageOutController extends BaseController<BottleStorageOut> {
 
-    @Resource
+    @Autowired
     private BottleStorageOutService outService;
 
 

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

@@ -2,6 +2,10 @@ package com.zd.bottle.mapper;
 
 import com.zd.bottle.domain.BottleStorageOut;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zd.bottle.vo.BottleStorageOutVo;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BottleStorageOutMapper extends BaseMapper<BottleStorageOut> {
 
+    /***
+     * 出库列表
+     * @param vo
+     * @return
+     */
+    List<BottleStorageOutVo>  getOutListVo(BottleStorageOutVo vo);
 }

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

@@ -2,6 +2,9 @@ package com.zd.bottle.service;
 
 import com.zd.bottle.domain.BottleStorageOut;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zd.bottle.vo.BottleStorageOutVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,5 +16,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BottleStorageOutService extends IService<BottleStorageOut> {
 
+    /**
+     * 入库
+     * @param bottleStorageOut
+     * @return
+     */
     boolean add(BottleStorageOut bottleStorageOut);
+
+    /***
+     * 出库列表
+     * @param vo
+     * @return
+     */
+    List<BottleStorageOutVo> getOutListVo(BottleStorageOutVo vo);
 }

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

@@ -6,6 +6,7 @@ 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.bottle.vo.BottleStorageOutVo;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.security.service.TokenService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -27,12 +29,16 @@ import java.util.Date;
 @Service
 public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMapper, BottleStorageOut> implements BottleStorageOutService {
 
-    @Resource
+    @Autowired
     private BottleStorageService bottleStorageService;
 
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private BottleStorageOutMapper outMapper;
+
+
     @Override
     public boolean add(BottleStorageOut bottleStorageOut) {
         if(StringUtils.isNull(bottleStorageOut.getStorageId())){
@@ -57,4 +63,14 @@ public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMap
         bottleStorageOut.setCreateTime(new Date());
         return save(bottleStorageOut);
     }
+
+    /***
+     * 出库列表
+     * @param vo
+     * @return
+     */
+    @Override
+    public List<BottleStorageOutVo> getOutListVo(BottleStorageOutVo vo) {
+        return outMapper.getOutListVo(vo);
+    }
 }

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

@@ -12,6 +12,7 @@
         <result column="is_status_sign" property="isStatusSign"/>
         <result column="is_photo" property="isPhoto"/>
         <result column="gas_pressure" property="gasPressure"/>
+        <result column="min_pressure" property="minPressure"/>
         <result column="validate_start_time" property="validateStartTime"/>
         <result column="validate_end_time" property="validateEndTime"/>
         <result column="electronic_tag" property="electronicTag"/>
@@ -44,6 +45,7 @@
         is_status_sign,
         is_photo,
         gas_pressure,
+        min_pressure,
         validate_start_time,
         validate_end_time,
         electronic_tag,

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

@@ -25,7 +25,45 @@
         phone,
         storage_id,
         pressure,
-        create_time
+        create_by,
+        create_time,
+        update_by,
+        update_time
     </sql>
 
+    <select id="getOutListVo" resultType="com.zd.bottle.vo.BottleStorageOutVo"
+            parameterType="com.zd.bottle.vo.BottleStorageOutVo">
+        SELECT
+        bso.id,
+        bso.user_name,
+        bso.user_id,
+        bso.dept_id,
+        bso.dept_name,
+        bso.phone,
+        bso.storage_id,
+        bso.pressure,
+        bso.create_by,
+        bso.create_time,
+        bso.update_by,
+        bso.update_time,
+        bs.electronic_tag electronicTag,
+        bs.air_number airNumber,
+        bs.air_name airName,
+        bs.config_name configName
+        FROM
+        ab_bottle_storage_out bso
+        LEFT JOIN ab_bottle_storage bs ON bso.storage_id = bs.id
+        <where>
+        <if test="searchValue != null">
+            and (
+            bso.user_name like concat('%', #{searchValue}, '%')
+            or bso.phone like concat('%', #{searchValue}, '%')
+            or bs.air_number like concat('%', #{searchValue}, '%')
+                )
+        </if>
+        <if test="startTime != null "> and date_format(bso.create_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
+        <if test="endTime != null "> and date_format(bso.create_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+        </where>
+    </select>
+
 </mapper>