From 48091c73d380ae78b8c84062128e4d096c0aab82 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 6 May 2023 14:37:27 +0800 Subject: [PATCH] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/databases/create_table.sql | 50 ++++++++++++--- .../CrudeOilInventoryRecordVo.java | 1 + .../crudeoiloutbound/CrudeOilOutbound.java | 4 +- .../CrudeOilOutboundDetailsVo.java | 4 +- .../crudeoiloutbound/CrudeOilOutboundDto.java | 4 +- .../CrudeOilOutboundQuery.java | 4 +- .../crudeoiloutbound/CrudeOilOutboundVo.java | 2 + .../FlowmeterInformation.java | 24 +++++++ .../FlowmeterInformationDetailsVo.java | 23 +++++++ .../FlowmeterInformationDto.java | 23 +++++++ .../FlowmeterInformationQuery.java | 23 +++++++ .../FlowmeterInformationVo.java | 29 +++++++++ .../api/tankinformation/TankInformation.java | 2 - .../TankInformationDetailsVo.java | 2 - .../tankinformation/TankInformationDto.java | 2 - .../tankinformation/TankInformationQuery.java | 2 - .../tankinformation/TankInformationVo.java | 2 - .../CrudeOilInventoryRecordMapper.java | 2 +- .../CrudeOilInventoryRecordRest.java | 22 ------- .../CrudeOilInventoryRecordService.java | 6 ++ .../CrudeOilOutboundMapper.xml | 6 +- .../CrudeOilOutboundRest.java | 11 +--- .../CrudeOilOutboundService.java | 8 ++- .../crudeoilstorage/CrudeOilStorageRest.java | 12 +--- .../FlowmeterInformationMapper.java | 31 ++++++++++ .../FlowmeterInformationMapper.xml | 18 ++++++ .../FlowmeterInformationRest.java | 61 ++++++++++++++++++ .../FlowmeterInformationService.java | 62 +++++++++++++++++++ .../TankInformationService.java | 2 +- 29 files changed, 367 insertions(+), 75 deletions(-) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformation.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql index 210c02a8..4ae3bfac 100644 --- a/yxt-supervise-cyf/docs/databases/create_table.sql +++ b/yxt-supervise-cyf/docs/databases/create_table.sql @@ -13,19 +13,19 @@ CREATE TABLE `tank_information` ( `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', - `number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐编号', +`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐编号', `capacity` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐容量', -`tankPipeline` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐管道', `crudeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐所属原油类型', `inventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐库存', -`initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存', -`existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）', + `initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存', + `existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '油罐信息' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '油罐信息' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; + DROP TABLE IF EXISTS `crude_oil_type_information`; CREATE TABLE `crude_oil_type_information` ( `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id', @@ -43,10 +43,11 @@ CREATE TABLE `crude_oil_type_information` ( `number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油编号', `code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油code', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油类型' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油类型' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; + DROP TABLE IF EXISTS `crude_oil_storage`; CREATE TABLE `crude_oil_storage` ( `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id', @@ -67,12 +68,14 @@ CREATE TABLE `crude_oil_storage` ( `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 '收料价值', +`warehousingDate` 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; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油入库' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; + DROP TABLE IF EXISTS `crude_oil_outbound`; CREATE TABLE `crude_oil_outbound` ( `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id', @@ -88,14 +91,16 @@ CREATE TABLE `crude_oil_outbound` ( `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid', `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', +`flowmeterSid` 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; +`deliveryDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库时间', +PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 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', @@ -117,3 +122,28 @@ CREATE TABLE `crude_oil_inventory_record` ( SET FOREIGN_KEY_CHECKS = 1; + +DROP TABLE IF EXISTS `flowmeter_information`; +CREATE TABLE `flowmeter_information` ( +`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', +`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计名称', +`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计编号', +`code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计code', +`tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', +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/CrudeOilInventoryRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java index 85b7dc28..01ecb8fa 100644 --- 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 @@ -20,4 +20,5 @@ public class CrudeOilInventoryRecordVo implements Vo { private String tankSid; //记录时间 private String recordDate; + private String tankNumber; } 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 index fae581c6..b2c881fe 100644 --- 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 @@ -17,8 +17,8 @@ public class CrudeOilOutbound extends BaseEntity { private String salesContractNumber; //签订时间 private String contractSigningDate; - //油罐sid - private String tankSid; + //流量计sid + private String flowmeterSid; //净重 private double weight; //价值 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 index 649f2c27..0f6b7fa4 100644 --- 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 @@ -19,8 +19,8 @@ public class CrudeOilOutboundDetailsVo implements Vo { private String salesContractNumber; //签订时间 private String contractSigningDate; - //油罐sid - private String tankSid; + //流量计sid + private String flowmeterSid; //净重 private double weight; //价值 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 index 15a42515..f3b915d9 100644 --- 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 @@ -18,8 +18,8 @@ public class CrudeOilOutboundDto implements Dto { private String salesContractNumber; //签订时间 private String contractSigningDate; - //油罐sid - private String tankSid; + //流量计sid + private String flowmeterSid; //净重 private double weight; //价值 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 index 0092005f..52022573 100644 --- 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 @@ -19,8 +19,8 @@ public class CrudeOilOutboundQuery implements Query { private String salesContractNumber; //签订时间 private String contractSigningDate; - //油罐sid - private String tankSid; + //流量计sid + private String flowmeterSid; //净重 private double weight; //价值 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 index 0497d1e2..9a8d5c02 100644 --- 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 @@ -32,4 +32,6 @@ public class CrudeOilOutboundVo implements Vo { private String crudeNumber; private String crudeName; private double inventory=0; + private String flowmeterSid; + private String flowmeterName; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformation.java new file mode 100644 index 00000000..c2772080 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformation.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.flowmeterinformation; + +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("flowmeter_information") +public class FlowmeterInformation extends BaseEntity { + //原油名称 + private String name; + //原油编号 + private String number; + //原油code + private String code; + private String tankSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDetailsVo.java new file mode 100644 index 00000000..fe0bccc2 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDetailsVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.flowmeterinformation; + +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 FlowmeterInformationDetailsVo implements Vo { + private String id; + private String sid; + //流量计名称 + private String name; + //流量计编号 + private String number; + //流量计code + private String code; + private String tankSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDto.java new file mode 100644 index 00000000..cb980b73 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDto.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.flowmeterinformation; + +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 FlowmeterInformationDto implements Dto { + private String id; + private String sid; + //流量计名称 + private String name; + //流量计编号 + private String number; + //流量计code + private String code; + private String tankSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationQuery.java new file mode 100644 index 00000000..1373a531 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.flowmeterinformation; + +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 FlowmeterInformationQuery implements Query { + private String id; + private String sid; + //流量计名称 + private String name; + //流量计编号 + private String number; + //流量计code + private String code; + private String tankSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationVo.java new file mode 100644 index 00000000..f76dc32d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationVo.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.flowmeterinformation; + +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 FlowmeterInformationVo implements Vo { + private String id; + private String sid; + + //流量计名称 + private String name; + //流量计编号 + private String number; + //流量计code + private String code; + //油罐sid + private String tankSid; + private String tankNumber; + private String crudeName; + private String crudeNumber; + +} 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 index 3dbb9ad9..553ef59a 100644 --- 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 @@ -20,8 +20,6 @@ public class TankInformation extends BaseEntity { private String capacity; //原油类型 private String crudeSid; - //油罐管道 - private String tankPipeline; //油罐库存 private double inventory=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 index d43982ca..0acc4ac6 100644 --- 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 @@ -20,8 +20,6 @@ public class TankInformationDetailsVo implements Vo { private String capacity; //原油类型 private String crudeSid; - //油罐管道 - private String tankPipeline; //油罐库存 private double inventory; //油罐初始库存 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 index 5ccbaac4..a5a8bb1f 100644 --- 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 @@ -20,8 +20,6 @@ public class TankInformationDto implements Dto { private String capacity; //原油类型 private String crudeSid; - //油罐管道 - private String tankPipeline; //油罐库存 private double inventory; //油罐初始库存 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 index 8e7487ac..bfb1cddc 100644 --- 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 @@ -20,8 +20,6 @@ public class TankInformationQuery implements Query { private String capacity; //原油类型 private String crudeSid; - //油罐管道 - private String tankPipeline; //油罐库存 private double inventory; //油罐初始库存 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 index 5d9db7ba..90b5c3d1 100644 --- 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 @@ -24,8 +24,6 @@ public class TankInformationVo implements Vo { private String crudeName; //原油类型编号 private String crudeNumber; - //油罐管道 - private String tankPipeline; //油罐库存 private double inventory; //油罐初始库存 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 index f3ac4082..409b4175 100644 --- 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 @@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Select; @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}") + @Select("select *,t.number as tankNumber from crude_oil_inventory_record left join tank_information t on t.sid =c.tankSid 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/CrudeOilInventoryRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java index 796c07e7..b9f5db01 100644 --- 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 @@ -20,31 +20,9 @@ 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 index 6fb2b5ba..76b630a7 100644 --- 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 @@ -1,6 +1,7 @@ package com.yxt.supervise.cyf.biz.crudeoilinventoryrecord; 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; @@ -14,6 +15,8 @@ import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + /** * @author wangpengfei * @date 2023/5/4 14:37 @@ -35,6 +38,9 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService + SELECT + f.*,t.number as tankNumber,c.name as crudeName,c.number as crudeNumber-- + FROM + flowmeter_information f + left join tank_information t on t.sid=f.tankSid + left join crude_oil_type_information c on c.sid=t.crudeSid + + ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationRest.java new file mode 100644 index 00000000..a11c8624 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.biz.flowmeterinformation; + +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.flowmeterinformation.FlowmeterInformationDto; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationQuery; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo; +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/flowmeter") +public class FlowmeterInformationRest { + @Autowired + FlowmeterInformationService FlowmeterInformationService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = FlowmeterInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/flowmeterList") + public ResultBean> flowmeterList() { + ResultBean rb = ResultBean.fireFail(); + List pv = FlowmeterInformationService.flowmeterList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody FlowmeterInformationDto dto){ + return FlowmeterInformationService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody FlowmeterInformationDto dto){ + return FlowmeterInformationService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getTankBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return FlowmeterInformationService.getTankBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return FlowmeterInformationService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java new file mode 100644 index 00000000..9245bf6b --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.cyf.biz.flowmeterinformation; + +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.flowmeterinformation.FlowmeterInformation; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationDto; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationQuery; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class FlowmeterInformationService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + FlowmeterInformationQuery 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 flowmeterList() { + return baseMapper.flowmeterList(); + } + public ResultBean save(FlowmeterInformationDto dto){ + ResultBean rb=new ResultBean(); + FlowmeterInformation entity=new FlowmeterInformation(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (FlowmeterInformationDto dto){ + ResultBean rb=new ResultBean(); + FlowmeterInformation entity=fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, entity, "id","sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getTankBySid(String sid){ + ResultBean rb=new ResultBean(); + FlowmeterInformationVo FlowmeterInformation=baseMapper.getFlowmeterBySid(sid); + return rb.success().setData(FlowmeterInformation); + } + 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/TankInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java index 1b5535cd..1b1bbc71 100644 --- 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 @@ -40,8 +40,8 @@ public class TankInformationService extends MybatisBaseService