Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

2 years ago · 9486c91ea9
12 changed files with 486 additions and 0 deletions
--- a/docs/databases/table_create_crm.sql
+++ b/docs/databases/table_create_crm.sql
@ -0,0 +1,89 @@
+DROP TABLE IF EXISTS `warehouse_location`;
+CREATE TABLE `warehouse_location`  (
+                                       `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',
+                                       `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '位置',
+                                       `squareMeasure` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '面积',
+                                       `floorHeight` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '层高',
+                                       `properties` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '性质',
+                                       `contacts` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
+                                       `price` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '价格',
+                                       `housingResources` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '房源',
+                                       `telephone` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
+                                       `province` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
+                                       `city` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
+                                       `county` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
+                                       PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '仓库位置信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+DROP TABLE IF EXISTS `loan_bank_information`;
+CREATE TABLE `loan_bank_information`  (
+                                          `id` int(0) NOT NULL AUTO_INCREMENT,
+                                          `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT 'ids',
+                                          `bankName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行名称',
+                                          `bankAbbreviation` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行简称',
+                                          `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '地址',
+                                          `province` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
+                                          `city` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
+                                          `county` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
+                                          `contacts` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
+                                          `telephone` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
+                                          `psid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT '0' COMMENT '上级sid',
+                                          `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+                                          `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                                          `modifyTime` timestamp(0) 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',
+                                          PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '贷款银行信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `enterprise_information`;
+CREATE TABLE `enterprise_information`  (
+                                           `id` int(0) NOT NULL AUTO_INCREMENT,
+                                           `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT 'ids',
+                                           `enterpriseName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '企业名称',
+                                           `enterpriseAbbreviation` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '企业简称',
+                                           `bankAccount` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行账户',
+                                           `accountNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '账号',
+                                           `openingBankName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '开户行',
+                                           `juridicalPerson` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '法人',
+                                           `businessLicenseNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '营业执照号',
+                                           `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '地址',
+                                           `province` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
+                                           `city` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
+                                           `county` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
+                                           `contacts` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
+                                           `telephone` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
+                                           `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+                                           `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                                           `modifyTime` timestamp(0) 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',
+                                           PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '企业信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocation.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocation.java
@ -0,0 +1,39 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:48
+ */
+@Data
+@ApiModel(value = "仓库位置信息", description = "仓库位置信息")
+@TableName("warehouse_location")
+public class WarehouseLocation extends BaseEntity {
+    @ApiModelProperty("位置")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("面积")
+    private String squareMeasure;
+    @ApiModelProperty("层高")
+    private String floorHeight;
+    @ApiModelProperty("性质")
+    private String properties;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("价格")
+    private String price;
+    @ApiModelProperty("房源")
+    private String housingResources;
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationDetailsVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationDetailsVo.java
@ -0,0 +1,39 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:48
+ */
+@Data
+@ApiModel(value = "仓库位置信息 视图数据详情", description = "仓库位置信息 视图数据详情")
+public class WarehouseLocationDetailsVo implements Vo {
+    private String sid;
+    private String id;
+    @ApiModelProperty("位置")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("面积")
+    private String squareMeasure;
+    @ApiModelProperty("层高")
+    private String floorHeight;
+    @ApiModelProperty("性质")
+    private String properties;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("价格")
+    private String price;
+    @ApiModelProperty("房源")
+    private String housingResources;
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationDto.java
@ -0,0 +1,46 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:48
+ */
+@ApiModel(value = "仓库位置信息 数据传输对象", description = "仓库位置信息 数据传输对象")
+@Data
+public class WarehouseLocationDto implements Dto {
+    private String sid;
+    private String id;
+    @ApiModelProperty("位置")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("面积")
+    private String squareMeasure;
+    @ApiModelProperty("层高")
+    private String floorHeight;
+    @ApiModelProperty("性质")
+    private String properties;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("价格")
+    private String price;
+    @ApiModelProperty("房源")
+    private String housingResources;
+    @ApiModelProperty("备注")
+    private String remarks;
+    private String [] imageFiles;
+
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationFeign.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationFeign.java
@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:48
+ */
+@Api(tags = "贷款银行信息")
+@FeignClient(
+        contextId = "supervise-crm-WarehouseLocation",
+        name = "supervise-crm",
+        path = "v1/warehouselocation",
+        fallback = WarehouseLocationFeignFallback.class)
+public interface WarehouseLocationFeign {
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationFeignFallback.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationFeignFallback.java
@ -0,0 +1,11 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:49
+ */
+@Component
+public class WarehouseLocationFeignFallback {
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationQuery.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationQuery.java
@ -0,0 +1,39 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:49
+ */
+@ApiModel(value = "仓库位置信息 查询条件", description = "仓库位置信息 查询条件")
+@Data
+public class WarehouseLocationQuery implements Query {
+    private String sid;
+    private String id;
+    @ApiModelProperty("位置")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("面积")
+    private String squareMeasure;
+    @ApiModelProperty("层高")
+    private String floorHeight;
+    @ApiModelProperty("性质")
+    private String properties;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("价格")
+    private String price;
+    @ApiModelProperty("房源")
+    private String housingResources;
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/warehouselocation/WarehouseLocationVo.java
@ -0,0 +1,41 @@
+package com.yxt.supervise.crm.api.warehouselocation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 16:49
+ */
+@ApiModel(value = "仓库位置信息 视图数据对象", description = "仓库位置信息 视图数据对象")
+@Data
+public class WarehouseLocationVo implements Vo {
+    private String sid;
+    private String id;
+    @ApiModelProperty("位置")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("面积")
+    private String squareMeasure;
+    @ApiModelProperty("层高")
+    private String floorHeight;
+    @ApiModelProperty("性质")
+    private String properties;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("价格")
+    private String price;
+    @ApiModelProperty("房源")
+    private String housingResources;
+    @ApiModelProperty("备注")
+    private String remarks;
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationMapper.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationMapper.java
@ -0,0 +1,25 @@
+package com.yxt.supervise.crm.biz.warehouselocation;
+
+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.crm.api.bankmanager.BankManagerVo;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocation;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationVo;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:09
+ */
+@Mapper
+public interface WarehouseLocationMapper extends BaseMapper<WarehouseLocation> {
+    IPage<WarehouseLocationVo> selectPageVo(IPage<WarehouseLocation> page, @Param(Constants.WRAPPER) Wrapper<WarehouseLocation> qw);
+    WarehouseLocationVo getWarehouseBySid( @Param("sid") String sid);
+
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationMapper.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.crm.biz.warehouselocation.WarehouseLocationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationVo">
+        SELECT *
+        FROM warehouse_location
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getWarehouseBySid" resultType="com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationVo">
+        SELECT *
+        FROM warehouse_location
+        WHERE sid=#{sid}
+    </select>
+</mapper>
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationRest.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationRest.java
@ -0,0 +1,57 @@
+package com.yxt.supervise.crm.biz.warehouselocation;
+
+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.crm.api.warehouselocation.WarehouseLocationDto;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationQuery;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationVo;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationFeign;
+import com.yxt.supervise.crm.biz.warehouselocation.WarehouseLocationService;
+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/4/12 17:10
+ */
+@Api(tags = "仓库位置信息")
+@RestController
+@RequestMapping("v1/warehouselocation")
+public class WarehouseLocationRest implements WarehouseLocationFeign {
+    @Autowired
+    WarehouseLocationService WarehouseLocationService;
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WarehouseLocationVo>> listPage(@RequestBody PagerQuery<WarehouseLocationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WarehouseLocationVo> pv = WarehouseLocationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody WarehouseLocationDto dto) {
+        return WarehouseLocationService.save(dto);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody WarehouseLocationDto dto) {
+        return WarehouseLocationService.update(dto);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @GetMapping("/getWarehouseBySid/{sid}")
+    public ResultBean getWarehouse(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseLocationVo WarehouseLocationVo=WarehouseLocationService.getWarehouse(sid);
+        return rb.success().setData(WarehouseLocationVo);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return WarehouseLocationService.delete(sid);
+    }
+}
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/warehouselocation/WarehouseLocationService.java
@ -0,0 +1,64 @@
+package com.yxt.supervise.crm.biz.warehouselocation;
+
+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.crm.api.warehouselocation.WarehouseLocation;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationDto;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationQuery;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationVo;
+import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 17:10
+ */
+@Service
+public class WarehouseLocationService extends MybatisBaseService<WarehouseLocationMapper, WarehouseLocation> {
+    public PagerVo<WarehouseLocationVo> listPageVo(PagerQuery<WarehouseLocationQuery> pq) {
+        WarehouseLocationQuery query = pq.getParams();
+        QueryWrapper<WarehouseLocation> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+
+        IPage<WarehouseLocation> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseLocationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<WarehouseLocationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(WarehouseLocationDto dto) {
+        ResultBean rb=new ResultBean();
+        WarehouseLocation entity=new WarehouseLocation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("保存仓库信息成功");
+    }
+    public ResultBean update(WarehouseLocationDto dto) {
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        WarehouseLocation entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改仓库信息成功");
+    }
+    public WarehouseLocationVo getWarehouse(String sid){
+        WarehouseLocationVo bank=baseMapper.getWarehouseBySid(sid);
+        return bank;
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<WarehouseLocation>().eq("sid",sid));
+        return rb.success().setMsg("删除仓库信息成功");
+    }
+}