气瓶文件增加

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

@@ -0,0 +1,102 @@
+package com.zd.airbottle.controller;
+
+import com.zd.airbottle.domain.bo.DbInOutRecordBo;
+import com.zd.airbottle.domain.bo.DbStockBo;
+import com.zd.airbottle.domain.vo.DbInOutRecordVo;
+import com.zd.airbottle.domain.vo.DbStockVo;
+import com.zd.airbottle.service.DbInOutRecordService;
+import com.zd.airbottle.service.DbStockService;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.domain.ResultData;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xxf
+ * @Date: 2023/10/18/11:16
+ * @Description:
+ */
+@Api(tags = "东北大学信息统计")
+@RestController
+@RequestMapping("/statistics")
+public class DbStatisticsController extends BaseController {
+
+    @Autowired
+    private DbInOutRecordService dbInOutRecordService;
+
+    @Autowired
+    private DbStockService dbStockService;
+
+
+    @GetMapping("/list")
+    @ApiOperation(value = "查询气瓶入库列表")
+    public ResultData list(DbInOutRecordBo bo) {
+
+        Map<String,Object> map = new HashMap<>(2);
+        //入库集合
+        bo.setType(1);
+        List<DbInOutRecordVo> inList =  dbInOutRecordService.selectInOutListCount(bo);
+
+        //出库集合
+        bo.setType(2);
+        List<DbInOutRecordVo> outList =  dbInOutRecordService.selectInOutListCount(bo);
+
+        map.put("inList",inList);
+        map.put("outList",outList);
+        return ResultData.success(map);
+    }
+
+
+    @GetMapping("/outList")
+    @ApiOperation(value = "用气数统计")
+    public ResultData outList(DbInOutRecordBo bo) {
+        //集合查询
+        List<DbInOutRecordVo> outList =  dbInOutRecordService.selectOutListCount(bo);
+        /*List<Object> changeList = new ArrayList<>();
+        if(outList!=null && outList.size()>0){
+            for (DbInOutRecordVo out:outList) {
+                changeList.add(out.getRecordMonth());
+                changeList.add(out.getRecordNum());
+            }
+        }*/
+        return ResultData.success(outList);
+    }
+
+
+    @GetMapping("/applyList")
+    @ApiOperation(value = "用气量统计")
+    public ResultData applyList(DbInOutRecordBo bo) {
+        //集合查询
+        List<DbInOutRecordVo> outList =  dbInOutRecordService.selectApplyListCount(bo);
+        return ResultData.success(outList);
+    }
+
+
+    /**********************************数据大屏*********************************/
+
+    @GetMapping("/stockGroup")
+    @ApiOperation(value = "气瓶库存数统计")
+    public ResultData stockGroup(DbStockBo bo) {
+        //集合查询
+        List<DbStockVo> list =  dbStockService.selectStockListGroupBy(bo);
+        return ResultData.success(list);
+    }
+
+    @GetMapping("/subjectGroup")
+    @ApiOperation(value = "实验室排名统计")
+    public ResultData subjectGroup(DbStockBo bo) {
+        //集合查询
+        startPage();
+        List<DbStockVo> list =  dbStockService.selectSubjectListGroupBy(bo);
+        return ResultData.success(list);
+    }
+
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbInOutRecordBo.java

@@ -0,0 +1,108 @@
+package com.zd.airbottle.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出入库记录表
+ * </p>
+ *
+ * @author xxf
+ * @since 2023-10-18
+ */
+@Data
+@ApiModel(value = "DbInOutRecord对象", description = "出入库记录表")
+public class DbInOutRecordBo{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty("级别（1入库 2出库）")
+    private Integer type;
+
+    @ApiModelProperty("气体名称")
+    private String gasName;
+
+    @ApiModelProperty("级别（1普通纯 2实验纯 3高级纯）")
+    private Integer level;
+
+    @ApiModelProperty("规格（5Mpa,10Mpa,15Mpa）")
+    private Integer size;
+
+    @ApiModelProperty("气体成分")
+    private String gasComposition;
+
+    @ApiModelProperty("学院id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("实验室名称")
+    private String subjectName;
+
+    @ApiModelProperty("房间号")
+    private String roomNum;
+
+    @ApiModelProperty("信标标签")
+    private String beaconTag;
+
+    @ApiModelProperty("操作人id")
+    private String operatorId;
+
+    @ApiModelProperty("操作人")
+    private String operator;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+    @ApiModelProperty("有效期限")
+    private LocalDateTime validPeriod;
+
+    @ApiModelProperty("气体压力")
+    private Integer gasPressure;
+
+    @ApiModelProperty("创建人名称")
+    private String createName;
+
+    @ApiModelProperty("创建人ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("修改人名称")
+    private String updateName;
+
+    @ApiModelProperty("修改人ID")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateBy;
+
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbInOutRecordVo.java

@@ -0,0 +1,112 @@
+package com.zd.airbottle.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出入库记录表
+ * </p>
+ *
+ * @author xxf
+ * @since 2023-10-18
+ */
+@Data
+@ApiModel(value = "DbInOutRecord对象", description = "出入库记录表")
+public class DbInOutRecordVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @ApiModelProperty("级别（1入库 2出库）")
+    private Integer type;
+
+    @ApiModelProperty("气体名称")
+    private String gasName;
+
+    @ApiModelProperty("级别（）")
+    private Integer level;
+
+    @ApiModelProperty("规格")
+    private Integer size;
+
+    @ApiModelProperty("气瓶编号")
+    private String bottleCode;
+
+    @ApiModelProperty("气体成分")
+    private String gasComposition;
+
+    @ApiModelProperty("学院id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("实验室名称")
+    private String subjectName;
+
+    @ApiModelProperty("房间号")
+    private String roomNum;
+
+    @ApiModelProperty("信标标签")
+    private String beaconTag;
+
+    @ApiModelProperty("操作人id")
+    private String operatorId;
+
+    @ApiModelProperty("操作人")
+    private String operator;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+    @ApiModelProperty("有效期限")
+    private LocalDateTime validPeriod;
+
+    @ApiModelProperty("气体压力")
+    private Integer gasPressure;
+
+    @ApiModelProperty("创建人名称")
+    private String createName;
+
+    @ApiModelProperty("创建人ID")
+    private Long createBy;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("修改人名称")
+    private String updateName;
+
+    @ApiModelProperty("修改人ID")
+    private Long updateBy;
+
+    @ApiModelProperty("修改时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("数量")
+    private int totalNum;
+
+    @ApiModelProperty("月份")
+    private String recordMonth;
+
+    @ApiModelProperty("年月")
+    private String yearMonth;
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbStockVo.java

@@ -0,0 +1,114 @@
+package com.zd.airbottle.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 库存表
+ * </p>
+ *
+ * @author hzw
+ * @since 2023-10-16
+ */
+@Data
+@ApiModel(value = "DbStock对象", description = "库存表")
+public class DbStockVo implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty("气瓶编号")
+    private Long bottleCode;
+
+    @ApiModelProperty("气体名称")
+    private String gasName;
+
+    @ApiModelProperty("级别（）")
+    private Integer level;
+
+    @ApiModelProperty("规格")
+    private Integer size;
+
+    @ApiModelProperty("气瓶颜色")
+    private String bottleColour;
+
+    @ApiModelProperty("手轮（0否 1是）")
+    private Boolean handwheel;
+
+    @ApiModelProperty("固定（0否 1是）")
+    private Boolean fixed;
+
+    @ApiModelProperty("状态标牌（0否 1是）")
+    private Boolean statusLabel;
+
+    @ApiModelProperty("电子标签（0否 1是）")
+    private Boolean electronicTag;
+
+    @ApiModelProperty("气体压力")
+    private Integer gasPressure;
+
+    @ApiModelProperty("有效期限")
+    private LocalDateTime validPeriod;
+
+    @ApiModelProperty("信标标签")
+    private String beaconTag;
+
+    @ApiModelProperty("学院id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("实验室名称")
+    private String subjectName;
+
+    @ApiModelProperty("房间号")
+    private String roomNum;
+
+    @ApiModelProperty("创建人名称")
+    private String createName;
+
+    @ApiModelProperty("创建人ID")
+    private Long createBy;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("修改人名称")
+    private String updateName;
+
+    @ApiModelProperty("修改人ID")
+    private Long updateBy;
+
+    @ApiModelProperty("修改时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("数量")
+    private int totalNum;
+
+    @ApiModelProperty("实验室级别")
+    private String subjectLevel;
+
+    @ApiModelProperty("实验室类型")
+    private String subjectType;
+}