diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql index 986bfd67..db8cd25b 100644 --- a/yxt-supervise-cyf/docs/databases/create_table.sql +++ b/yxt-supervise-cyf/docs/databases/create_table.sql @@ -310,3 +310,25 @@ PRIMARY KEY (`id`) USING BTREE SET FOREIGN_KEY_CHECKS = 1; +DROP TABLE IF EXISTS `supplier_information`; +CREATE TABLE `supplier_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', +`supplierName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供应商名称', +`supplierCode` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供应商code', +`supplierNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供应商编号', +`contacts` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人', +`telephone` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话', +PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '供应商信息' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file 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 efc8ddbc..3dd163e0 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 @@ -19,7 +19,7 @@ public class CrudeOilOutboundVo implements Vo { //签订时间 private String contractSigningDate; //油罐sid - private String tankSid; + private String tankSid; //油罐编号 private String tankNumber; //净重 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 index bde975c8..ac132e8f 100644 --- 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 @@ -36,6 +36,7 @@ public class CrudeOilStorageVo implements Vo { private String crudeNumber; //入库日期 private String warehousingDate; + private String supplierName; private double inventory=0; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformation.java new file mode 100644 index 00000000..513b98d0 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformation.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.supplierinformation; + +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("supplier_information") +public class SupplierInformation extends BaseEntity { + //供应商编号 + private String supplierNumber; + //供应商名称 + private String supplierName; + //供应商code + private String supplierCode; + //联系人 + private String contacts; + // + private String telephone; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDetailsVo.java new file mode 100644 index 00000000..4ac763a2 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDetailsVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.supplierinformation; + +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 SupplierInformationDetailsVo implements Vo { + private String id; + private String sid; + + //供应商编号 + private String supplierNumber; + //供应商名称 + private String supplierName; + //供应商code + private String supplierCode; + //联系人 + private String contacts; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDto.java new file mode 100644 index 00000000..037d4269 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationDto.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.supplierinformation; + +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 SupplierInformationDto implements Dto { + private String id; + private String sid; + + //供应商编号 + private String supplierNumber; + //供应商名称 + private String supplierName; + //供应商code + private String supplierCode; + //联系人 + private String contacts; + // + private String telephone; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationQuery.java new file mode 100644 index 00000000..b28160d3 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationQuery.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.supplierinformation; + +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 SupplierInformationQuery implements Query { + private String id; + private String sid; + + //供应商编号 + private String supplierNumber; + //供应商名称 + private String supplierName; + //供应商code + private String supplierCode; + //联系人 + private String contacts; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationVo.java new file mode 100644 index 00000000..53d50595 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/supplierinformation/SupplierInformationVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.supplierinformation; + +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 SupplierInformationVo implements Vo { + private String id; + private String sid; + + //供应商编号 + private String supplierNumber; + //供应商名称 + private String supplierName; + //供应商code + private String supplierCode; + //联系人 + private String contacts; + //联系电话 + private String telephone; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.java new file mode 100644 index 00000000..4869a930 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.app.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; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilInventoryRecordAppMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @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); + void insertCrudeOilFiles(List> maps); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.xml new file mode 100644 index 00000000..fb3fd8ec --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + insert into crude_oil_record_file (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppRest.java new file mode 100644 index 00000000..69852574 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppRest.java @@ -0,0 +1,39 @@ +package com.yxt.supervise.cyf.app.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.CrudeOilInventoryRecordDto; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordQuery; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "原油库存记录信息") +@RestController +@RequestMapping("cyf/app/crudeinventory") +public class CrudeOilInventoryRecordAppRest { + @Autowired + CrudeOilInventoryRecordAppService 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); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppService.java new file mode 100644 index 00000000..bccc79bd --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilinventoryrecord/CrudeOilInventoryRecordAppService.java @@ -0,0 +1,96 @@ +package com.yxt.supervise.cyf.app.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; +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.CrudeOilInventoryRecord; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordDto; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordQuery; +import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo; +import com.yxt.supervise.cyf.api.tankinformation.TankInformation; +import com.yxt.supervise.cyf.app.tankinformation.TankInformationAppMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilInventoryRecordAppService extends MybatisBaseService { + @Autowired + TankInformationAppMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilInventoryRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(c.recordDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getNumber())) { + qw.like("t.number", query.getNumber()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + @Transactional + public ResultBean save(CrudeOilInventoryRecordDto dto){ + ResultBean rb=new ResultBean(); + CrudeOilInventoryRecord entity=new CrudeOilInventoryRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + Date curDate = new Date(); + String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + entity.setRecordDate(dfmt); + entity.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity()); + String [] file=dto.getCrudeOilRecordFile(); + if(file!=null){ + List> maps=new ArrayList<>(); + for(String s:file){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertCrudeOilFiles(maps); + } + } + baseMapper.insert(entity); + //油罐每日填写信息修改 + tank.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity()); + 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/app/crudeoiloutbound/CrudeOilOutboundAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.java new file mode 100644 index 00000000..f9d2770b --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.app.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; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilOutboundAppMapper 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); + void insertCrudeOilFiles(List> maps); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml new file mode 100644 index 00000000..789fecbe --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + insert into crude_oil_outbound_file (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppRest.java new file mode 100644 index 00000000..3311bdf0 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppRest.java @@ -0,0 +1,43 @@ +package com.yxt.supervise.cyf.app.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/app/crudeoutbound") +public class CrudeOilOutboundAppRest { + @Autowired + CrudeOilOutboundAppService 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("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return CrudeOilOutboundService.getCrudeBySid(sid); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppService.java new file mode 100644 index 00000000..51d0739e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppService.java @@ -0,0 +1,97 @@ +package com.yxt.supervise.cyf.app.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.app.flowmeterinformation.FlowmeterInformationAppMapper; +import com.yxt.supervise.cyf.app.tankinformation.TankInformationAppMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilOutboundAppService extends MybatisBaseService { + @Autowired + TankInformationAppMapper tankInformationMapper; + @Autowired + FlowmeterInformationAppMapper flowmeterInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilOutboundQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(c.deliveryDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getContractNumber())) { + qw.like("c.salesContractNumber", query.getContractNumber()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + @Transactional + 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); + String [] file=dto.getCrudeOilOutboundFiles(); + if(file!=null){ + List> maps=new ArrayList<>(); + for(String s:file){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertCrudeOilFiles(maps); + } + } + baseMapper.insert(entity); + TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); + 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/app/crudeoilstorage/CrudeOilStorageAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.java new file mode 100644 index 00000000..73ea60e7 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.app.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; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface CrudeOilStorageAppMapper 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); + void insertCrudeOilFiles(List> maps); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml new file mode 100644 index 00000000..ec321e30 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + insert into crude_oil_storage_file (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppRest.java new file mode 100644 index 00000000..a12a2f0d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppRest.java @@ -0,0 +1,44 @@ +package com.yxt.supervise.cyf.app.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/app/crudestorage") +public class CrudeOilStorageAppRest { + @Autowired + CrudeOilStorageAppService 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("根据sid查询") + @GetMapping("/getCrudeBySid/{sid}") + public ResultBean getCrudeBySid(@PathVariable String sid){ + return CrudeOilStorageService.getCrudeBySid(sid); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppService.java new file mode 100644 index 00000000..83b349f6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppService.java @@ -0,0 +1,99 @@ +package com.yxt.supervise.cyf.app.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.app.tankinformation.TankInformationAppMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilStorageAppService extends MybatisBaseService { + @Autowired + TankInformationAppMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilStorageQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(c.warehousingDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getContractNumber())) { + qw.like("c.contractNumber", query.getContractNumber()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + @Transactional + public ResultBean save(CrudeOilStorageDto dto){ + + ResultBean rb=new ResultBean(); + CrudeOilStorage entity=new CrudeOilStorage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + String [] file=dto.getCrudeOilStorageFile(); + if(file!=null){ + List> maps=new ArrayList<>(); + for(String s:file){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertCrudeOilFiles(maps); + } + } + 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/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.java new file mode 100644 index 00000000..93b70ce5 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.app.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 CrudeOilTypeInformationAppMapper 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/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.xml new file mode 100644 index 00000000..ded57e2f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppMapper.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/app/crudeoiltypeinformation/CrudeOilTypeInformationAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppRest.java new file mode 100644 index 00000000..eb8795e3 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.app.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/app/crudeinfo") +public class CrudeOilTypeInformationAppRest { + @Autowired + CrudeOilTypeInformationAppService 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/app/crudeoiltypeinformation/CrudeOilTypeInformationAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppService.java new file mode 100644 index 00000000..7d0c7e96 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppService.java @@ -0,0 +1,78 @@ +package com.yxt.supervise.cyf.app.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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class CrudeOilTypeInformationAppService 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/app/flowmeterinformation/FlowmeterInformationAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppMapper.java new file mode 100644 index 00000000..3dc974f3 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppMapper.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.app.flowmeterinformation; + +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.flowmeterinformation.FlowmeterInformation; +import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo; +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 FlowmeterInformationAppMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select(" SELECT" + + " *,t.number as tankNumber,c.name as crdueName,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 ") + List flowmeterList(); + @Select("select f.*,t.number as tankNumber from flowmeter_information f left join tank_information t on t.sid=f.tankSid where f.sid=#{sid}") + FlowmeterInformationVo getFlowmeterBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppMapper.xml new file mode 100644 index 00000000..d131b754 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppMapper.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/app/flowmeterinformation/FlowmeterInformationAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppRest.java new file mode 100644 index 00000000..b2f21a76 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.app.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/app/flowmeter") +public class FlowmeterInformationAppRest { + @Autowired + FlowmeterInformationAppService 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/app/flowmeterinformation/FlowmeterInformationAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppService.java new file mode 100644 index 00000000..83c7b414 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/flowmeterinformation/FlowmeterInformationAppService.java @@ -0,0 +1,66 @@ +package com.yxt.supervise.cyf.app.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.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class FlowmeterInformationAppService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + FlowmeterInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("f.name", query.getName()); + } + 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/app/tankinformation/TankInformationAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppMapper.java new file mode 100644 index 00000000..d693f64f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppMapper.java @@ -0,0 +1,38 @@ +package com.yxt.supervise.cyf.app.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 TankInformationAppMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("SELECT\n" + + "\tt.*,\n" + + "\tc.NAME AS crudeName,\n" + + "\tc.number AS crudeNumber,\n" + + "\tf.name as flowmeterName,\n" + + "\tf.number as flowmeterNumber\n" + + "FROM\n" + + "\ttank_information t\n" + + "\tLEFT JOIN crude_oil_type_information c ON c.sid = t.crudeSid\n" + + "\tleft join flowmeter_information f on f.sid =t.flowmeterSid ") + List tankList(); + @Select("select * from tank_information where sid=#{sid}") + TankInformation getTankBySid(@Param("sid")String sid); + + @Select("select *,f.name as flowmeterName,f.number as flowmeterNumber from tank_information t left join flowmeter_information f on f.sid=t.flowmeterSid where crudeSid=#{crudeSid} ") + List listByType(@Param("crudeSid") String crudeSid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppMapper.xml new file mode 100644 index 00000000..af4161ba --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppRest.java new file mode 100644 index 00000000..dbba42a7 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppRest.java @@ -0,0 +1,69 @@ +package com.yxt.supervise.cyf.app.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/app/tankinfo") +public class TankInformationAppRest { + @Autowired + TankInformationAppService 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); + } + + @ApiOperation("根据原油种类查询数据的列表") + @GetMapping("/listByType/{crudeSid}") + public ResultBean> listByType(@PathVariable String crudeSid) { + ResultBean rb = ResultBean.fireFail(); + List pv = tankInformationService.listByType(crudeSid); + return rb.success().setData(pv); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppService.java new file mode 100644 index 00000000..583dbbaf --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/tankinformation/TankInformationAppService.java @@ -0,0 +1,71 @@ +package com.yxt.supervise.cyf.app.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 TankInformationAppService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + TankInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getNumber())) { + qw.like("t.number", query.getNumber()); + } + 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 List listByType(String crudeSid) { + return baseMapper.listByType(crudeSid); + } + public ResultBean save(TankInformationDto dto){ + ResultBean rb=new ResultBean(); + TankInformation entity=new TankInformation(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setInventory(dto.getInitialInventory()); + 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("删除成功"); + } +} 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 index 76f826d3..ba3087ce 100644 --- 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 @@ -5,11 +5,13 @@ + SELECT + * + FROM + supplier_information + + ${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/supplierinformation/SupplierInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/supplierinformation/SupplierInformationRest.java new file mode 100644 index 00000000..98928bae --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/supplierinformation/SupplierInformationRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.biz.supplierinformation; + +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.supplierinformation.SupplierInformationDto; +import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationQuery; +import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo; +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/supplier") +public class SupplierInformationRest { + @Autowired + SupplierInformationService RawSupplierInformationService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = RawSupplierInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("查询数据的列表") + @PostMapping("/supplierList") + public ResultBean> typeList() { + ResultBean rb = ResultBean.fireFail(); + List pv = RawSupplierInformationService.supplierList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody SupplierInformationDto dto){ + return RawSupplierInformationService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody SupplierInformationDto dto){ + return RawSupplierInformationService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getSupplierBySid/{sid}") + public ResultBean getSupplierBySid(@PathVariable String sid){ + return RawSupplierInformationService.getSupplierBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return RawSupplierInformationService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/supplierinformation/SupplierInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/supplierinformation/SupplierInformationService.java new file mode 100644 index 00000000..c2e28e37 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/supplierinformation/SupplierInformationService.java @@ -0,0 +1,70 @@ +package com.yxt.supervise.cyf.biz.supplierinformation; + +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.supplierinformation.SupplierInformation; +import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationDto; +import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationQuery; +import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class SupplierInformationService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + SupplierInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getSupplierName())){ + qw.like("supplierName",query.getSupplierName()); + } + if(StringUtils.isNotBlank(query.getSupplierCode())){ + qw.like("supplierCode",query.getSupplierCode()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List supplierList() { + return baseMapper.supplierList(); + } + public ResultBean save(SupplierInformationDto dto){ + ResultBean rb=new ResultBean(); + SupplierInformation entity=new SupplierInformation(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (SupplierInformationDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + SupplierInformation entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getSupplierBySid(String sid){ + ResultBean rb=new ResultBean(); + SupplierInformation RawSupplierInformation=baseMapper.getSupplierBySid(sid); + return rb.success().setData(RawSupplierInformation); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +}