From ae549889ec1b78e1a4f0d1bca5a8d33c9b377ead Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 26 Jun 2024 11:16:12 +0800 Subject: [PATCH] 06-26 --- .../com/yxt/supplier/apiadmin/SupplierBankRest.java | 2 +- .../com/yxt/supplier/apiadmin/SupplierFileRest.java | 2 +- .../com/yxt/supplier/apiadmin/SupplierInfoRest.java | 2 +- .../com/yxt/supplier/apiadmin/SupplierTypeRest.java | 12 +++++++++++- .../biz/suppliertype/SupplierTypeMapper.java | 5 +++++ .../biz/suppliertype/SupplierTypeService.java | 9 +++++++++ src/main/resources/application-dev.yml | 6 +++--- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierBankRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierBankRest.java index be1a68a..5b90751 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierBankRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierBankRest.java @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "供应商开户行信息") @RestController -@RequestMapping("/apiadmin/base/basesupplierbank") +@RequestMapping("/apiadmin/supplierbank") public class SupplierBankRest { @Autowired diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierFileRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierFileRest.java index d405268..e885a4f 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierFileRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierFileRest.java @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "供应商附件") @RestController -@RequestMapping("/apiadmin/base/basesupplierfile") +@RequestMapping("/apiadmin/supplierfile") public class SupplierFileRest { @Autowired diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java index 26182f4..96f7cac 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java @@ -51,7 +51,7 @@ import java.util.List; */ @Api(tags = "供应商信息") @RestController -@RequestMapping("/apiadmin/base/basesupplierinfo") +@RequestMapping("/apiadmin/supplierinfo") public class SupplierInfoRest { @Autowired diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java index 1f93cd6..2fb4959 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "供应商类型") @RestController -@RequestMapping("/apiadmin/base/basesuppliertype") +@RequestMapping("/apiadmin/suppliertype") public class SupplierTypeRest { @Autowired @@ -86,4 +86,14 @@ public class SupplierTypeRest { SupplierTypeDetailsVo vo = supplierTypeService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkSaveCode/{sid}/") + public ResultBean checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid){ + return supplierTypeService.checkSaveCode(supplierTypeCode,useOrgSid); + } + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkUpdateCode/{sid}/{}") + public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("orgSid")String dtoSid){ + return supplierTypeService.checkUpdateCode(supplierTypeCode,useOrgSid,dtoSid); + } } diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java index f712cf0..6d5d2d0 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java @@ -57,4 +57,9 @@ public interface SupplierTypeMapper extends BaseMapper { @Select("select * from supplier_type") List selectListVo(); + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid}") + int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid); + + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") + int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java index a3ca96e..578f66c 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java @@ -31,9 +31,11 @@ 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 org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PathVariable; /** * Project: yxt-base(仓储基础信息供应商)
@@ -91,4 +93,11 @@ public class SupplierTypeService extends MybatisBaseService checkSaveCode(String supplierTypeCode, String orgSid){ + return new ResultBean().success().setData(baseMapper.checkSaveCode(supplierTypeCode,orgSid)); + } + public ResultBean checkUpdateCode(String supplierTypeCode, String orgSid,String dtoSid){ + return new ResultBean().success().setData(baseMapper.checkUpdateCode(supplierTypeCode,orgSid,dtoSid)); + } + } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 83d310d..dfc804f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,12 +11,12 @@ spring: cloud: nacos: discovery: - namespace: common - server-addr: 39.104.100.138:8848 +# namespace: common + server-addr: 127.0.0.1:8848 register-enabled: false redis: database: 3 # Redis数据库索引（默认为0） - host: 39.104.100.138 + host: 127.0.0.1 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制）