包冲突修改名称

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/supplier/SupplierController.java

@@ -7,9 +7,9 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.module.resource.controller.admin.supplier.vo.*;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 import com.yc.ship.module.resource.enums.UseStatusEnum;
-import com.yc.ship.module.resource.service.supplier.SupplierService;
+import com.yc.ship.module.resource.service.supplier.ProductSupplierService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -34,10 +34,10 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 @RestController
 @RequestMapping("/resource/supplier")
 @Validated
-public class SupplierController {
+public class ProductSupplierController {
 
     @Resource
-    private SupplierService supplierService;
+    private ProductSupplierService supplierService;
 
     @PostMapping("/create")
     @Operation(summary = "创建资源供应商")
@@ -134,7 +134,7 @@ public class SupplierController {
     public CommonResult<List<SupplierSimpleRespVO>> getSimpleList(SupplierListReqVO reqVO) {
 
         reqVO.setUseStatus(UseStatusEnum.ENABLE.getStatus());
-        List<SupplierDO> list= supplierService.getSimpleListByCategory(reqVO);
+        List<ProductSupplierDO> list= supplierService.getSimpleListByCategory(reqVO);
 
         return success(BeanUtils.toBean(list, SupplierSimpleRespVO.class));
     }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/supplier/SupplierDO.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SupplierDO extends TenantBaseDO {
+public class ProductSupplierDO extends TenantBaseDO {
 
     /**
      * 主键

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/resource/ResourceMapper.java

@@ -7,7 +7,7 @@ import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.resource.controller.admin.resource.vo.ResourcePageReqVO;
 import com.yc.ship.module.resource.dal.dataobject.resource.ResourceDO;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 import com.yc.ship.module.resource.enums.UseStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -39,7 +39,7 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> {
                 .orderByDesc(ResourceDO::getId));
     }
 
-    IPage<ResourceDO> queryPage(IPage<SupplierDO> iPage, @Param("param")ResourcePageReqVO pageReqVO);
+    IPage<ResourceDO> queryPage(IPage<ProductSupplierDO> iPage, @Param("param")ResourcePageReqVO pageReqVO);
 
     default List<ResourceDO> getSimpleResourceList(){
         return selectList(new LambdaQueryWrapperX<ResourceDO>()

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/supplier/ProductSupplierMapper.java

@@ -0,0 +1,58 @@
+package com.yc.ship.module.resource.dal.mysql.supplier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierListReqVO;
+import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierPageReqVO;
+import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierRespVO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * 资源供应商 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface ProductSupplierMapper extends BaseMapperX<ProductSupplierDO> {
+
+    default PageResult<ProductSupplierDO> selectPage(SupplierPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductSupplierDO>()
+                .likeIfPresent(ProductSupplierDO::getName, reqVO.getName())
+                .eqIfPresent(ProductSupplierDO::getType, reqVO.getType())
+                .eqIfPresent(ProductSupplierDO::getUseStatus, reqVO.getUseStatus())
+                .gtIfPresent(ProductSupplierDO::getCooperateStartTime, reqVO.getCooperateStartTime())
+                .ltIfPresent(ProductSupplierDO::getCooperateEndTime, reqVO.getCooperateEndTime())
+                .eqIfPresent(ProductSupplierDO::getContactMan, reqVO.getContactMan())
+                .eqIfPresent(ProductSupplierDO::getContactPhone, reqVO.getContactPhone())
+                .eqIfPresent(ProductSupplierDO::getContactAddress, reqVO.getContactAddress())
+                .eqIfPresent(ProductSupplierDO::getBusinessArea, reqVO.getBusinessArea())
+                .eqIfPresent(ProductSupplierDO::getContract, reqVO.getContract())
+                .eqIfPresent(ProductSupplierDO::getShortName,reqVO.getShortName())
+                .eqIfPresent(ProductSupplierDO::getIsSystemDirect, reqVO.getIsSystemDirect())
+                .eqIfPresent(ProductSupplierDO::getDirectParam, reqVO.getDirectParam())
+                .eqIfPresent(ProductSupplierDO::getDirectAccount, reqVO.getDirectAccount())
+                .eqIfPresent(ProductSupplierDO::getDirectOrderUrl, reqVO.getDirectOrderUrl())
+                .eqIfPresent(ProductSupplierDO::getDirectCheckUrl, reqVO.getDirectCheckUrl())
+                .eqIfPresent(ProductSupplierDO::getDirectRefundUrl, reqVO.getDirectRefundUrl())
+                .likeIfPresent(ProductSupplierDO::getUnitName, reqVO.getUnitName())
+                .eqIfPresent(ProductSupplierDO::getUnitAddress, reqVO.getUnitAddress())
+                .likeIfPresent(ProductSupplierDO::getBankName, reqVO.getBankName())
+                .eqIfPresent(ProductSupplierDO::getBankAccount, reqVO.getBankAccount())
+                .eqIfPresent(ProductSupplierDO::getTaxId, reqVO.getTaxId())
+                .eqIfPresent(ProductSupplierDO::getTelephone, reqVO.getTelephone())
+                .eqIfPresent(ProductSupplierDO::getInterbankNumber, reqVO.getInterbankNumber())
+                .betweenIfPresent(ProductSupplierDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ProductSupplierDO::getId));
+    }
+
+    IPage<SupplierRespVO> queryPage(IPage<SupplierRespVO> iPage, @Param("param")SupplierPageReqVO pageReqVO);
+    List<ProductSupplierDO> getSimpleListByCategory(@Param("param") SupplierListReqVO param);
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/supplier/SupplierMapper.java

@@ -1,58 +0,0 @@
-package com.yc.ship.module.resource.dal.mysql.supplier;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
-import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierListReqVO;
-import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierPageReqVO;
-import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierRespVO;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 资源供应商 Mapper
- *
- * @author 管理员
- */
-@Mapper
-public interface SupplierMapper extends BaseMapperX<SupplierDO> {
-
-    default PageResult<SupplierDO> selectPage(SupplierPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<SupplierDO>()
-                .likeIfPresent(SupplierDO::getName, reqVO.getName())
-                .eqIfPresent(SupplierDO::getType, reqVO.getType())
-                .eqIfPresent(SupplierDO::getUseStatus, reqVO.getUseStatus())
-                .gtIfPresent(SupplierDO::getCooperateStartTime, reqVO.getCooperateStartTime())
-                .ltIfPresent(SupplierDO::getCooperateEndTime, reqVO.getCooperateEndTime())
-                .eqIfPresent(SupplierDO::getContactMan, reqVO.getContactMan())
-                .eqIfPresent(SupplierDO::getContactPhone, reqVO.getContactPhone())
-                .eqIfPresent(SupplierDO::getContactAddress, reqVO.getContactAddress())
-                .eqIfPresent(SupplierDO::getBusinessArea, reqVO.getBusinessArea())
-                .eqIfPresent(SupplierDO::getContract, reqVO.getContract())
-                .eqIfPresent(SupplierDO::getShortName,reqVO.getShortName())
-                .eqIfPresent(SupplierDO::getIsSystemDirect, reqVO.getIsSystemDirect())
-                .eqIfPresent(SupplierDO::getDirectParam, reqVO.getDirectParam())
-                .eqIfPresent(SupplierDO::getDirectAccount, reqVO.getDirectAccount())
-                .eqIfPresent(SupplierDO::getDirectOrderUrl, reqVO.getDirectOrderUrl())
-                .eqIfPresent(SupplierDO::getDirectCheckUrl, reqVO.getDirectCheckUrl())
-                .eqIfPresent(SupplierDO::getDirectRefundUrl, reqVO.getDirectRefundUrl())
-                .likeIfPresent(SupplierDO::getUnitName, reqVO.getUnitName())
-                .eqIfPresent(SupplierDO::getUnitAddress, reqVO.getUnitAddress())
-                .likeIfPresent(SupplierDO::getBankName, reqVO.getBankName())
-                .eqIfPresent(SupplierDO::getBankAccount, reqVO.getBankAccount())
-                .eqIfPresent(SupplierDO::getTaxId, reqVO.getTaxId())
-                .eqIfPresent(SupplierDO::getTelephone, reqVO.getTelephone())
-                .eqIfPresent(SupplierDO::getInterbankNumber, reqVO.getInterbankNumber())
-                .betweenIfPresent(SupplierDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(SupplierDO::getId));
-    }
-
-    IPage<SupplierRespVO> queryPage(IPage<SupplierRespVO> iPage, @Param("param")SupplierPageReqVO pageReqVO);
-    List<SupplierDO> getSimpleListByCategory(@Param("param") SupplierListReqVO param);
-
-}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/resource/ResourceServiceImpl.java

@@ -14,9 +14,9 @@ import com.yc.ship.module.resource.controller.admin.resource.vo.ResourceAccessRe
 import com.yc.ship.module.resource.controller.admin.resource.vo.ResourcePageReqVO;
 import com.yc.ship.module.resource.controller.admin.resource.vo.ResourceSaveReqVO;
 import com.yc.ship.module.resource.dal.dataobject.resource.ResourceDO;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 import com.yc.ship.module.resource.dal.mysql.resource.ResourceMapper;
-import com.yc.ship.module.resource.dal.mysql.supplier.SupplierMapper;
+import com.yc.ship.module.resource.dal.mysql.supplier.ProductSupplierMapper;
 import com.yc.ship.module.resource.dal.redis.RedisKeyConstants;
 import com.yc.ship.module.resource.enums.ErrorCodeConstants;
 import com.yc.ship.module.resource.service.resource.util.DesUtil;
@@ -54,7 +54,7 @@ public class ResourceServiceImpl implements ResourceService {
     private ResourceMapper resourceMapper;
 
     @Resource
-    private SupplierMapper supplierMapper;
+    private ProductSupplierMapper supplierMapper;
 
     String PLAT_SERVICE = "platSupplierTradeService";
     String STANDARD_SERVICE = "standardSupplierTradeService";
@@ -106,7 +106,7 @@ public class ResourceServiceImpl implements ResourceService {
 
     @Override
     public PageResult<ResourceDO> getResourcePage(ResourcePageReqVO pageReqVO) {
-        IPage<SupplierDO> iPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<ProductSupplierDO> iPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<ResourceDO> page = resourceMapper.queryPage(iPage,pageReqVO);
 
 //        return resourceMapper.selectPage(pageReqVO);
@@ -134,7 +134,7 @@ public class ResourceServiceImpl implements ResourceService {
     @Cacheable(cacheNames = RedisKeyConstants.ACCESS_PRODUCT_LIST+"#60", key = "#supplierId")
     public List<ResourceAccessRespVO> getProductListByAccessList(String supplierId) {
         List<ResourceAccessRespVO> list = new ArrayList<>();
-        SupplierDO supplierDO = supplierMapper.selectById(supplierId);
+        ProductSupplierDO supplierDO = supplierMapper.selectById(supplierId);
         if(supplierDO!=null && supplierDO.getIsSystemDirect()==1){
             if(ZSHL_SERVICE.equals(supplierDO.getDirectServer())){
                 //九凤谷票务
@@ -150,7 +150,7 @@ public class ResourceServiceImpl implements ResourceService {
         return list;
     }
 
-    public List<ResourceAccessRespVO> loadZshlProductList(SupplierDO supplierDO){
+    public List<ResourceAccessRespVO> loadZshlProductList(ProductSupplierDO supplierDO){
         List<ResourceAccessRespVO> list = new ArrayList<>();
         try {
             //九凤谷票务
@@ -791,7 +791,7 @@ public class ResourceServiceImpl implements ResourceService {
         System.out.println("返回参数:"+postJson);
         return postJson;
     }
-    public List<ResourceAccessRespVO> loadCruiseProductList(SupplierDO supplierDO){
+    public List<ResourceAccessRespVO> loadCruiseProductList(ProductSupplierDO supplierDO){
         List<ResourceAccessRespVO> list = new ArrayList<>();
         try {
             //船舶物资
@@ -824,7 +824,7 @@ public class ResourceServiceImpl implements ResourceService {
         return list;
     }
 
-    public List<ResourceAccessRespVO> loadZwyProductList(SupplierDO supplierDO){
+    public List<ResourceAccessRespVO> loadZwyProductList(ProductSupplierDO supplierDO){
         List<ResourceAccessRespVO> list = new ArrayList<>();
         try {
             //自我游

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/supplier/SupplierService.java

@@ -2,7 +2,7 @@ package com.yc.ship.module.resource.service.supplier;
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.module.resource.controller.admin.supplier.vo.*;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
  *
  * @author 管理员
  */
-public interface SupplierService {
+public interface ProductSupplierService {
 
     /**
      * 创建资源供应商
@@ -42,7 +42,7 @@ public interface SupplierService {
      * @param id 编号
      * @return 资源供应商
      */
-    SupplierDO getSupplier(Long id);
+    ProductSupplierDO getSupplier(Long id);
     SupplierRespVO getSupplierById(Long id);
 
     /**
@@ -58,7 +58,7 @@ public interface SupplierService {
 
     SupplierImportRespVO importSupplierList(List<SupplierImportExcelVO> list, Boolean updateSupport);
 
-    List<SupplierDO> getSimpleListByCategory(SupplierListReqVO reqVO);
+    List<ProductSupplierDO> getSimpleListByCategory(SupplierListReqVO reqVO);
 
     SupplierRespVO getSupplierByDirectAccount(String directAccount);
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/supplier/SupplierServiceImpl.java

@@ -7,9 +7,9 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.util.MyBatisUtils;
 import com.yc.ship.module.resource.controller.admin.supplier.vo.*;
-import com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO;
+import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 import com.yc.ship.module.resource.dal.dataobject.suppliercategory.SupplierCategoryDO;
-import com.yc.ship.module.resource.dal.mysql.supplier.SupplierMapper;
+import com.yc.ship.module.resource.dal.mysql.supplier.ProductSupplierMapper;
 import com.yc.ship.module.resource.enums.ErrorCodeConstants;
 import com.yc.ship.module.resource.service.suppliercategory.SupplierCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +34,10 @@ import static com.yc.ship.module.system.enums.ErrorCodeConstants.USER_IMPORT_LIS
  */
 @Service
 @Validated
-public class SupplierServiceImpl implements SupplierService {
+public class ProductSupplierServiceImpl implements ProductSupplierService {
 
     @Resource
-    private SupplierMapper supplierMapper;
+    private ProductSupplierMapper supplierMapper;
     @Autowired
     private SupplierCategoryService supplierCategoryService;
 
@@ -45,7 +45,7 @@ public class SupplierServiceImpl implements SupplierService {
     @Transactional(rollbackFor = Exception.class)
     public Long createSupplier(SupplierSaveReqVO createReqVO) {
         // 插入
-        SupplierDO supplier = BeanUtils.toBean(createReqVO, SupplierDO.class);
+        ProductSupplierDO supplier = BeanUtils.toBean(createReqVO, ProductSupplierDO.class);
         Long id = IdWorker.getId(supplier);
         supplier.setId(id);
         supplier.setDeleted(false);
@@ -64,7 +64,7 @@ public class SupplierServiceImpl implements SupplierService {
         // 校验存在
         validateSupplierExists(updateReqVO.getId());
         // 更新
-        SupplierDO updateObj = BeanUtils.toBean(updateReqVO, SupplierDO.class);
+        ProductSupplierDO updateObj = BeanUtils.toBean(updateReqVO, ProductSupplierDO.class);
         supplierMapper.updateById(updateObj);
         supplierCategoryService.deleteSupplierCategory(updateObj.getId());
         List<Long> resourceList = updateReqVO.getResourceType();
@@ -90,13 +90,13 @@ public class SupplierServiceImpl implements SupplierService {
     }
 
     @Override
-    public SupplierDO getSupplier(Long id) {
+    public ProductSupplierDO getSupplier(Long id) {
         return  supplierMapper.selectById(id);
     }
 
     @Override
     public SupplierRespVO getSupplierById(Long id) {
-        SupplierDO supplierDO = supplierMapper.selectById(id);
+        ProductSupplierDO supplierDO = supplierMapper.selectById(id);
         List<SupplierCategoryDO> list = supplierCategoryService.getSupplierCategoryList(id);
         List<Long> categoryList = list.stream().map(SupplierCategoryDO::getCategoryId).collect(Collectors.toList());
         SupplierRespVO respVO = BeanUtils.toBean(supplierDO, SupplierRespVO.class);
@@ -116,7 +116,7 @@ public class SupplierServiceImpl implements SupplierService {
         // 校验用户存在
         validateSupplierExists(id);
         // 更新状态
-        SupplierDO supplier = new SupplierDO();
+        ProductSupplierDO supplier = new ProductSupplierDO();
         supplier.setId(id);
         supplier.setUseStatus(status);
         supplierMapper.updateById(supplier);
@@ -138,16 +138,16 @@ public class SupplierServiceImpl implements SupplierService {
     }
 
     @Override
-    public List<SupplierDO> getSimpleListByCategory(SupplierListReqVO reqVO) {
+    public List<ProductSupplierDO> getSimpleListByCategory(SupplierListReqVO reqVO) {
 
         return supplierMapper.getSimpleListByCategory(reqVO);
     }
 
     @Override
     public SupplierRespVO getSupplierByDirectAccount(String directAccount) {
-        List<SupplierDO> lidst = supplierMapper.selectList(SupplierDO::getDirectAccount, directAccount);
+        List<ProductSupplierDO> lidst = supplierMapper.selectList(ProductSupplierDO::getDirectAccount, directAccount);
         if(lidst!=null && lidst.size()>0){
-            SupplierDO supplierDO = lidst.get(0);
+            ProductSupplierDO supplierDO = lidst.get(0);
             SupplierRespVO respVO = BeanUtils.toBean(supplierDO, SupplierRespVO.class);
             return respVO;
         }

ship-module-resource/ship-module-resource-biz/src/main/resources/mapper/supplier/SupplierMapper.xml

@@ -1,6 +1,6 @@
 <?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.yc.ship.module.resource.dal.mysql.supplier.SupplierMapper">
+<mapper namespace="com.yc.ship.module.resource.dal.mysql.supplier.ProductSupplierMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
@@ -44,7 +44,7 @@
     </select>
 
 
-    <select id="getSimpleListByCategory" resultType="com.yc.ship.module.resource.dal.dataobject.supplier.SupplierDO">
+    <select id="getSimpleListByCategory" resultType="com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO">
         select ps.name,ps.id,ps.type from product_supplier ps
         INNER JOIN product_supplier_category psc
         on ps.id = psc.supplier_id and psc.category_id = #{param.cateId}