diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql index 8d78db1c..210c02a8 100644 --- a/yxt-supervise-cyf/docs/databases/create_table.sql +++ b/yxt-supervise-cyf/docs/databases/create_table.sql @@ -60,16 +60,13 @@ CREATE TABLE `crude_oil_storage` ( `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid', `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid', -`inventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐库存', - `initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存', - `existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）', - `contractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同号', - `supplierSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供货商sid`', - `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同签订日期', - `licensePlateNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发货车牌号', - `tankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', - `weight` double(255, 0) NULL DEFAULT NULL COMMENT '收料净重', - `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收料价值', +`contractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同号', +`supplierSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供货商sid`', +`contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同签订日期', +`licensePlateNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发货车牌号', +`tankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', +`weight` double(255, 0) NULL DEFAULT NULL COMMENT '收料净重', +`value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收料价值', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油入库' ROW_FORMAT = Dynamic; @@ -89,17 +86,34 @@ CREATE TABLE `crude_oil_outbound` ( `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid', `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid', -`inventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐库存', - `initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存', - `existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）', - `salesContractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '销售合同号', - `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签订日期', - `tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', - `weight` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '净重', - `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值', +`salesContractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '销售合同号', +`contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签订日期', +`tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', +`weight` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '净重', +`value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油出库记录' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; +DROP TABLE IF EXISTS `crude_oil_inventory_record`; +CREATE TABLE `crude_oil_inventory_record` ( +`id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id', +`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid', +`lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁', +`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', +`modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', +`isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用', +`state` int(0) NULL DEFAULT 1 COMMENT '状态', +`isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除', +`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', +`createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid', +`updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid', +`existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '当日库存记录（每日填写）', +`tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', +`recordDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录日期', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油库存记录表(每日填写)' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java new file mode 100644 index 00000000..003513d1 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.crudeoilinventoryrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "原油库存记录信息", description = "原油库存记录信息") +@TableName("crude_oil_inventory_record") +public class CrudeOilInventoryRecord extends BaseEntity { + + //油罐现有库存 + private double existingInventory; + //油罐sid + private String tankSid; + //记录时间 + private String recordDate; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java new file mode 100644 index 00000000..f941611f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoilinventoryrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油库存记录信息 视图数据详情", description = "原油库存记录信息 视图数据详情") +public class CrudeOilInventoryRecordDetailsVo implements Vo { + private String id; + private String sid; + + //油罐现有库存 + private double existingInventory; + //油罐sid + private String tankSid; + //记录时间 + private String recordDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java new file mode 100644 index 00000000..6221fcc9 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.api.crudeoilinventoryrecord; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油库存记录信息 数据传输对象", description = "原油库存记录信息 数据传输对象") +public class CrudeOilInventoryRecordDto implements Dto { + private String id; + private String sid; + //油罐现有库存 + private double existingInventory; + //油罐sid + private String tankSid; + //记录时间 + private String recordDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java new file mode 100644 index 00000000..4a7a2703 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoilinventoryrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油库存记录信息 查询条件", description = "原油库存记录信息 查询条件") +public class CrudeOilInventoryRecordQuery implements Query { + private String id; + private String sid; + + //油罐现有库存 + private double existingInventory; + //油罐sid + private String tankSid; + //记录时间 + private String recordDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java new file mode 100644 index 00000000..85b7dc28 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoilinventoryrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油库存记录信息 视图数据对象", description = "原油库存记录信息 视图数据对象") +public class CrudeOilInventoryRecordVo implements Vo { + private String id; + private String sid; + + //油罐现有库存 + private double existingInventory; + //油罐sid + private String tankSid; + //记录时间 + private String recordDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java new file mode 100644 index 00000000..fae581c6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.crudeoiloutbound; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "原油出库信息", description = "原油出库信息") +@TableName("crude_oil_outbound") +public class CrudeOilOutbound extends BaseEntity { + //销售合同编号 + private String salesContractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + //出库时间 + private String deliveryDate; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java new file mode 100644 index 00000000..649f2c27 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.crudeoiloutbound; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油出库信息 视图数据详情", description = "原油出库信息 视图数据详情") +public class CrudeOilOutboundDetailsVo implements Vo { + private String id; + private String sid; + + + //销售合同编号 + private String salesContractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + private String remarks; + //出库时间 + private String deliveryDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java new file mode 100644 index 00000000..15a42515 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.cyf.api.crudeoiloutbound; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油出库信息 数据传输对象", description = "原油出库信息 数据传输对象") +public class CrudeOilOutboundDto implements Dto { + private String id; + private String sid; + + //销售合同编号 + private String salesContractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + private String remarks; + //出库时间 + private String deliveryDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java new file mode 100644 index 00000000..0092005f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.crudeoiloutbound; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油出库信息 查询条件", description = "原油出库信息 查询条件") +public class CrudeOilOutboundQuery implements Query { + private String id; + private String sid; + + + //销售合同编号 + private String salesContractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + private String remarks; + //出库时间 + private String deliveryDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java new file mode 100644 index 00000000..0497d1e2 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.crudeoiloutbound; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油出库信息 视图数据对象", description = "原油出库信息 视图数据对象") +public class CrudeOilOutboundVo implements Vo { + private String id; + private String sid; + + //销售合同编号 + private String salesContractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //油罐编号 + private String tankNumber; + //净重 + private double weight; + //价值 + private String value; + private String remarks; + //出库时间 + private String deliveryDate; + private String crudeNumber; + private String crudeName; + private double inventory=0; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java new file mode 100644 index 00000000..3fc3191f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.cyf.api.crudeoilstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "原油入库信息", description = "原油入库信息") +@TableName("crude_oil_storage") +public class CrudeOilStorage extends BaseEntity { + + //销售合同编号 + private String contractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + //发货车牌号 + private String licensePlateNumber; + //供应商 + private String supplierSid; + //入库日期 + private String warehousingDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDetailsVo.java new file mode 100644 index 00000000..667b393f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDetailsVo.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.crudeoilstorage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油入库信息 视图数据详情", description = "原油入库信息 视图数据详情") +public class CrudeOilStorageDetailsVo implements Vo { + private String id; + private String sid; + + + //销售合同编号 + private String contractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + //发货车牌号 + private String licensePlateNumber; + //供应商 + private String supplierSid; + private String remarks; + //入库日期 + private String warehousingDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java new file mode 100644 index 00000000..6864a349 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.crudeoilstorage; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油入库信息 数据传输对象", description = "原油入库信息 数据传输对象") +public class CrudeOilStorageDto implements Dto { + private String id; + private String sid; + + + //销售合同编号 + private String contractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + //发货车牌号 + private String licensePlateNumber; + //供应商 + private String supplierSid; + private String remarks; + //入库日期 + private String warehousingDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java new file mode 100644 index 00000000..d7bf6c1d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.crudeoilstorage; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油入库信息 查询条件", description = "原油入库信息 查询条件") +public class CrudeOilStorageQuery implements Query { + private String id; + private String sid; + + + //销售合同编号 + private String contractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //净重 + private double weight; + //价值 + private String value; + //发货车牌号 + private String licensePlateNumber; + //供应商 + private String supplierSid; + private String remarks; + //入库日期 + private String warehousingDate; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java new file mode 100644 index 00000000..bde975c8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java @@ -0,0 +1,41 @@ +package com.yxt.supervise.cyf.api.crudeoilstorage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油入库信息 视图数据对象", description = "原油入库信息 视图数据对象") +public class CrudeOilStorageVo implements Vo { + private String id; + private String sid; + + + //销售合同编号 + private String contractNumber; + //签订时间 + private String contractSigningDate; + //油罐sid + private String tankSid; + //油罐编号 + private String tankNumber; + //净重 + private double weight; + //价值 + private String value; + //发货车牌号 + private String licensePlateNumber; + //供应商 + private String supplierSid; + private String remarks; + private String crudeName; + private String crudeNumber; + //入库日期 + private String warehousingDate; + private double inventory=0; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java new file mode 100644 index 00000000..bcf24585 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.crudeoiltypeinformation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "原油类型", description = "原油类型") +@TableName("crude_oil_type_information") +public class CrudeOilTypeInformation extends BaseEntity { + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDetailsVo.java new file mode 100644 index 00000000..60583c6f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDetailsVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoiltypeinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油类型 视图数据对象", description = "原油类型 视图数据对象") +public class CrudeOilTypeInformationDetailsVo implements Vo { + private String id; + private String sid; + + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java new file mode 100644 index 00000000..684bd035 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.api.crudeoiltypeinformation; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油类型 数据传输对象", description = "原油类型 数据传输对象") +public class CrudeOilTypeInformationDto implements Dto { + private String id; + private String sid; + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationQuery.java new file mode 100644 index 00000000..2006ee1d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoiltypeinformation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "原油类型 查询条件", description = "原油类型 查询条件") +public class CrudeOilTypeInformationQuery implements Query { + private String id; + private String sid; + + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java new file mode 100644 index 00000000..56408a8f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.crudeoiltypeinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "原油类型 视图数据详情", description = "原油类型 视图数据详情") +public class CrudeOilTypeInformationVo implements Vo { + private String id; + private String sid; + + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java new file mode 100644 index 00000000..3dbb9ad9 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.tankinformation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "油罐信息", description = "油罐信息") +@TableName("tank_information") +public class TankInformation extends BaseEntity { + //油罐编号 + private String number; + //油罐容量 + private String capacity; + //原油类型 + private String crudeSid; + //油罐管道 + private String tankPipeline; + //油罐库存 + private double inventory=0; + //油罐初始库存 + private double initialInventory=0; + //油罐现有库存 + private double existingInventory=0; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java new file mode 100644 index 00000000..d43982ca --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.tankinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "油罐信息 视图数据详情", description = "油罐信息 视图数据详情") +public class TankInformationDetailsVo implements Vo { + private String id; + private String sid; + + //油罐编号 + private String number; + //油罐容量 + private String capacity; + //原油类型 + private String crudeSid; + //油罐管道 + private String tankPipeline; + //油罐库存 + private double inventory; + //油罐初始库存 + private double initialInventory; + //油罐现有库存 + private double existingInventory; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java new file mode 100644 index 00000000..5ccbaac4 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.tankinformation; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "油罐信息 数据传输对象", description = "油罐信息 数据传输对象") +public class TankInformationDto implements Dto { + private String id; + private String sid; + + //油罐编号 + private String number; + //油罐容量 + private String capacity; + //原油类型 + private String crudeSid; + //油罐管道 + private String tankPipeline; + //油罐库存 + private double inventory; + //油罐初始库存 + private double initialInventory; + //油罐现有库存 + private double existingInventory; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java new file mode 100644 index 00000000..8e7487ac --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.tankinformation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "油罐信息 查询条件", description = "油罐信息 查询条件") +public class TankInformationQuery implements Query { + private String id; + private String sid; + + //油罐编号 + private String number; + //油罐容量 + private String capacity; + //原油类型 + private String crudeSid; + //油罐管道 + private String tankPipeline; + //油罐库存 + private double inventory; + //油罐初始库存 + private double initialInventory; + //油罐现有库存 + private double existingInventory; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java new file mode 100644 index 00000000..5d9db7ba --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.tankinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "油罐信息 视图数据对象", description = "油罐信息 视图数据对象") +public class TankInformationVo implements Vo { + private String id; + private String sid; + + //油罐编号 + private String number; + //油罐容量 + private String capacity; + //原油类型 + private String crudeSid; + //原油类型名称 + private String crudeName; + //原油类型编号 + private String crudeNumber; + //油罐管道 + private String tankPipeline; + //油罐库存 + private double inventory; + //油罐初始库存 + private double initialInventory; + //油罐现有库存 + private double existingInventory; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java new file mode 100644 index 00000000..f3ac4082 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.biz.crudeoilinventoryrecord; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecord; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilInventoryRecordMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from crude_oil_inventory_record where sid=#{sid}") + CrudeOilInventoryRecord getCrudeBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml new file mode 100644 index 00000000..a7d97b10 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java new file mode 100644 index 00000000..796c07e7 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java @@ -0,0 +1,50 @@ +package com.yxt.supervise.cyf.biz.crudeoilinventoryrecord; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "原油库存记录信息") +@RestController +@RequestMapping("cyf/crudeinventory") +public class CrudeOilInventoryRecordRest { + @Autowired + CrudeOilInventoryRecordService CrudeOilInventoryRecordService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = CrudeOilInventoryRecordService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody CrudeOilInventoryRecordDto dto){ + return CrudeOilInventoryRecordService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody CrudeOilInventoryRecordDto dto){ + return CrudeOilInventoryRecordService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return CrudeOilInventoryRecordService.getCrudeBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return CrudeOilInventoryRecordService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java new file mode 100644 index 00000000..6fb2b5ba --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java @@ -0,0 +1,63 @@ +package com.yxt.supervise.cyf.biz.crudeoilinventoryrecord; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.*; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilInventoryRecordService extends MybatisBaseService { + @Autowired + TankInformationMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilInventoryRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean save(CrudeOilInventoryRecordDto dto){ + ResultBean rb=new ResultBean(); + CrudeOilInventoryRecord entity=new CrudeOilInventoryRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + //油罐每日填写信息修改 + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + tank.setExistingInventory(dto.getExistingInventory()); + tankInformationMapper.updateById(tank); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (CrudeOilInventoryRecordDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + CrudeOilInventoryRecord entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getCrudeBySid(String sid){ + ResultBean rb=new ResultBean(); + CrudeOilInventoryRecord CrudeOilInventoryRecord=baseMapper.getCrudeBySid(sid); + return rb.success().setData(CrudeOilInventoryRecord); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java new file mode 100644 index 00000000..af472262 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.biz.crudeoiloutbound; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutbound; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilOutboundMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from crude_oil_outbound where sid=#{sid}") + CrudeOilOutbound getCrudeBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml new file mode 100644 index 00000000..76082824 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundRest.java new file mode 100644 index 00000000..f1bae39e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundRest.java @@ -0,0 +1,52 @@ +package com.yxt.supervise.cyf.biz.crudeoiloutbound; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundDto; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundQuery; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "出库信息") +@RestController +@RequestMapping("cyf/crudeoutbound") +public class CrudeOilOutboundRest { + @Autowired + CrudeOilOutboundService CrudeOilOutboundService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = CrudeOilOutboundService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody CrudeOilOutboundDto dto){ + return CrudeOilOutboundService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody CrudeOilOutboundDto dto){ + return CrudeOilOutboundService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return CrudeOilOutboundService.getCrudeBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return CrudeOilOutboundService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java new file mode 100644 index 00000000..bc05055e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java @@ -0,0 +1,79 @@ +package com.yxt.supervise.cyf.biz.crudeoiloutbound; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutbound; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundDto; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundQuery; +import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper; +import com.yxt.supervise.cyf.biz.tankinformation.TankInformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilOutboundService extends MybatisBaseService { + @Autowired + TankInformationMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilOutboundQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean save(CrudeOilOutboundDto dto){ + ResultBean rb=new ResultBean(); + CrudeOilOutbound entity=new CrudeOilOutbound(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + Date curDate = new Date(); + String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); + entity.setDeliveryDate(dfmt); + baseMapper.insert(entity); + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存 +// if(tank.getLockVersion().equals(0)){ +// tank.setInventory(tank.getInitialInventory()-dto.getWeight()); +// tank.setLockVersion(tank.getLockVersion()+1); +// }else{ +// tank.setInventory(tank.getInventory()-dto.getWeight()); +// } + tank.setInventory(tank.getInventory()-dto.getWeight()); + tankInformationMapper.updateById(tank); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (CrudeOilOutboundDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + CrudeOilOutbound entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getCrudeBySid(String sid){ + ResultBean rb=new ResultBean(); + CrudeOilOutbound CrudeOilOutbound=baseMapper.getCrudeBySid(sid); + return rb.success().setData(CrudeOilOutbound); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java new file mode 100644 index 00000000..8de439e8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.biz.crudeoilstorage; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorage; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilStorageMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from crude_oil_type_information where sid=#{sid}") + CrudeOilStorage getCrudeBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml new file mode 100644 index 00000000..f679b91c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageRest.java new file mode 100644 index 00000000..f07d8223 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageRest.java @@ -0,0 +1,52 @@ +package com.yxt.supervise.cyf.biz.crudeoilstorage; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageDto; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageQuery; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "入库信息") +@RestController +@RequestMapping("cyf/crudestorage") +public class CrudeOilStorageRest { + @Autowired + CrudeOilStorageService CrudeOilStorageService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = CrudeOilStorageService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody CrudeOilStorageDto dto){ + return CrudeOilStorageService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody CrudeOilStorageDto dto){ + return CrudeOilStorageService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getCrudeBySid(@PathVariable String sid){ + return CrudeOilStorageService.getCrudeBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return CrudeOilStorageService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java new file mode 100644 index 00000000..37825a8c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java @@ -0,0 +1,73 @@ +package com.yxt.supervise.cyf.biz.crudeoilstorage; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorage; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageDto; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageQuery; +import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilStorageService extends MybatisBaseService { + @Autowired + TankInformationMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilStorageQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean save(CrudeOilStorageDto dto){ + ResultBean rb=new ResultBean(); + CrudeOilStorage entity=new CrudeOilStorage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + //油罐库存增加 + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存 +// if(tank.getLockVersion().equals(0)){ +// tank.setInventory(tank.getInitialInventory()+dto.getWeight()); +// tank.setLockVersion(tank.getLockVersion()+1); +// }else{ +// tank.setInventory(tank.getInventory()+dto.getWeight()); +// } + tank.setInventory(tank.getInventory()+dto.getWeight()); + tankInformationMapper.updateById(tank); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (CrudeOilStorageDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + CrudeOilStorage entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getCrudeBySid(String sid){ + ResultBean rb=new ResultBean(); + CrudeOilStorage CrudeOilStorage=baseMapper.getCrudeBySid(sid); + return rb.success().setData(CrudeOilStorage); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.java new file mode 100644 index 00000000..48cfcf89 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.biz.crudeoiltypeinformation; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilTypeInformationMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from crude_oil_type_information") + List crudeList(); + + + @Select("select * from crude_oil_type_information where sid=#{sid}") + CrudeOilTypeInformation getCrudeBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.xml new file mode 100644 index 00000000..4fd5db5c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationRest.java new file mode 100644 index 00000000..bd43da8e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.biz.crudeoiltypeinformation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationQuery; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "原油类型") +@RestController +@RequestMapping("cyf/crudeinfo") +public class CrudeOilTypeInformationRest { + @Autowired + CrudeOilTypeInformationService CrudeOilTypeInformationService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = CrudeOilTypeInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("查询数据的列表") + @PostMapping("/list") + public ResultBean> crudeList() { + ResultBean rb = ResultBean.fireFail(); + List pv = CrudeOilTypeInformationService.crudeList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody CrudeOilTypeInformationDto dto){ + return CrudeOilTypeInformationService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody CrudeOilTypeInformationDto dto){ + return CrudeOilTypeInformationService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return CrudeOilTypeInformationService.getCrudeBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return CrudeOilTypeInformationService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationService.java new file mode 100644 index 00000000..34b0eae1 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiltypeinformation/CrudeOilTypeInformationService.java @@ -0,0 +1,79 @@ +package com.yxt.supervise.cyf.biz.crudeoiltypeinformation; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationQuery; +import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilTypeInformationService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilTypeInformationQuery query = pq.getParams(); + + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("name",query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List crudeList() { + return baseMapper.crudeList(); + + } + + public ResultBean save(CrudeOilTypeInformationDto dto){ + ResultBean rb=new ResultBean(); + CrudeOilTypeInformation number=baseMapper.selectOne(new QueryWrapper().eq("number",dto.getNumber())); + if(number!=null){ + return rb.setMsg("油类编号重复"); + } + CrudeOilTypeInformation name=baseMapper.selectOne(new QueryWrapper().eq("name",dto.getNumber())); + if(name!=null){ + return rb.setMsg("油类重复"); + } + CrudeOilTypeInformation entity=new CrudeOilTypeInformation(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (CrudeOilTypeInformationDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + CrudeOilTypeInformation entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getCrudeBySid(String sid){ + ResultBean rb=new ResultBean(); + CrudeOilTypeInformation CrudeOilTypeInformation=baseMapper.getCrudeBySid(sid); + return rb.success().setData(CrudeOilTypeInformation); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java new file mode 100644 index 00000000..4cd461e1 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.biz.tankinformation; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface TankInformationMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select t.*,c.name as crudeName,c.number as crudeNumber from tank_information t left join crude_oil_type_information c on c.sid=t.crudeSid ") + List tankList(); + @Select("select * from tank_information where sid=#{sid}") + TankInformation getTankBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml new file mode 100644 index 00000000..b6674c0a --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java new file mode 100644 index 00000000..27ac2d71 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.biz.tankinformation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationDto; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationQuery; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "油罐信息") +@RestController +@RequestMapping("cyf/tankinfo") +public class TankInformationRest { + @Autowired + TankInformationService tankInformationService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = tankInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/tankList") + public ResultBean> listPage() { + ResultBean rb = ResultBean.fireFail(); + List pv = tankInformationService.tankList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody TankInformationDto dto){ + return tankInformationService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody TankInformationDto dto){ + return tankInformationService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getTankBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return tankInformationService.getTankBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return tankInformationService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java new file mode 100644 index 00000000..1b5535cd --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java @@ -0,0 +1,66 @@ +package com.yxt.supervise.cyf.biz.tankinformation; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationDto; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationQuery; +import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class TankInformationService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + TankInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List tankList() { + + return baseMapper.tankList(); + } + public ResultBean save(TankInformationDto dto){ + ResultBean rb=new ResultBean(); + TankInformation entity=new TankInformation(); + entity.setInventory(entity.getInitialInventory()); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (TankInformationDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + TankInformation entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getTankBySid(String sid){ + ResultBean rb=new ResultBean(); + TankInformation tankInformation=baseMapper.getTankBySid(sid); + return rb.success().setData(tankInformation); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +}