添加了客户信息

hx-admin/pom.xml

@@ -48,6 +48,11 @@
             <artifactId>hx-oa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-customer</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -76,4 +81,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

hx-admin/src/main/resources/application-dev.yml

@@ -35,6 +35,10 @@ spring:
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
 
+                customer:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
     # redis 配置
     redis:
         # 地址

hx-admin/src/main/resources/application-test.yml

@@ -7,38 +7,43 @@ spring:
             primary: base
             datasource:
                 oa:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 mes:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 wms:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 item:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 supply:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 base:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 iot:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
+
+                customer:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:
         # 地址
-        host: 36.134.91.96
+        host: 127.0.0.1
         # 端口，默认为6379
         port: 6379
         # 数据库索引

hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -1,7 +1,7 @@
 package com.fjhx.common.constant;
 
-public interface SourceConstant {
 
+public interface SourceConstant {
     String ITEM = "item";
 
     String SUPPLY = "supply";
@@ -11,6 +11,9 @@ public interface SourceConstant {
     String WMS = "wms";
 
     String MES = "mes";
+
     String OA = "oa";
 
+    String CUSTOMER = "customer";
+
 }

hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerController.java

@@ -1,5 +1,7 @@
 package com.fjhx.customer.controller.customer;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
@@ -19,6 +21,7 @@ import java.util.List;
  * @author
  * @since 2023-04-04
  */
+@DS(SourceConstant.CUSTOMER)
 @RestController
 @RequestMapping("/customer")
 public class CustomerController {
@@ -34,6 +37,15 @@ public class CustomerController {
         return customerService.getPage(dto);
     }
 
+
+    /**
+     * 私海客户表分页（添加权限自己看自己）
+     */
+    @PostMapping("/privateSeaPage")
+    public Page<CustomerVo> privateSeaPage(@RequestBody CustomerSelectDto dto) {
+        return customerService.privateSeaPage(dto);
+    }
+
     /**
      * 客户表明细
      */
@@ -68,6 +80,14 @@ public class CustomerController {
 
 
 
+    /**
+     * 客户分配
+     */
+    @PostMapping("/CustomerAllocation")
+    public void CustomerAllocation(@RequestBody CustomerDto dto) {
+            customerService.updateById(dto);
+    }
+
 
 
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/CustomerService.java

@@ -45,4 +45,8 @@ public interface CustomerService extends BaseService<Customer> {
      */
     void delete(Long id);
 
+    /**
+     * 私海客户表分页（添加权限自己看自己）
+     */
+    Page<CustomerVo> privateSeaPage(CustomerSelectDto dto);
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.customer.service.customer.CustomerUserService;
 import com.fjhx.customer.utils.code.CodeEnum;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.security.Security;
 import java.util.List;
 
 /**
@@ -48,8 +50,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),Customer::getStatus,dto.getStatus());
         //客户状态（0：公海客户  1：私海客户）(业务员ID为null为公海客户，业务员ID不为null为私海客户)
         if (ObjectUtil.isNotEmpty(dto.getType())){
-            wrapper.isNotNull(dto.getType().equals("1"),Customer::getUserId);
-            wrapper.isNull(dto.getType().equals("0"),Customer::getUserId);
+            //私海客户查询
+            if (dto.getType().equals("1")){
+                wrapper.isNotNull(Customer::getUserId);
+            }else if (dto.getType().equals("0")){
+                wrapper.isNull(Customer::getUserId);
+            }
         }
         wrapper.orderByDesc(Customer::getCreateTime);
         Page<CustomerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -81,6 +87,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     public void add(CustomerDto customerDto) {
         customerDto.setCode(CodeEnum.CUSTOMER.getCode());
         this.save(customerDto);
+        //添加库户-联系人表的信息
         saveCustomerUse(customerDto);
     }
 
@@ -94,7 +101,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         this.updateById(customerDto);
         //删除客户-用户表的信息
         customerUserService.remove(Wrappers.<CustomerUser>lambdaQuery().eq(CustomerUser::getCustomerId,customerDto.getId()));
-
+        //添加库户-联系人表的信息
+        saveCustomerUse(customerDto);
     }
 
     /**
@@ -109,6 +117,21 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         customerUserService.remove(Wrappers.<CustomerUser>lambdaQuery().eq(CustomerUser::getCustomerId,id));
     }
 
+    /**
+     * 私海客户表分页（添加权限自己看自己）
+     */
+    @Override
+    public Page<CustomerVo> privateSeaPage(CustomerSelectDto dto) {
+        LambdaQueryWrapper<Customer> wrapper = Wrappers.<Customer>lambdaQuery();
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getSource()),Customer::getSource,dto.getSource());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),Customer::getStatus,dto.getStatus());
+        //添加权限（自己看自己）
+        wrapper.eq(Customer::getUserId, SecurityUtils.getUserId());
+        wrapper.orderByDesc(Customer::getCreateTime);
+        Page<CustomerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
     //添加客户用户表的信息
     private void  saveCustomerUse(CustomerDto customerDto){
         List<CustomerUser> customerUserDtoList = customerDto.getCustomerUserList();

hx-iot/src/main/java/com/fjhx/iot/controller/tda/TdaApplicationController.java

@@ -2,6 +2,7 @@ package com.fjhx.iot.controller.tda;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.iot.entity.tda.dto.TdaApplicationDto;
 import com.fjhx.iot.entity.tda.dto.TdaApplicationSelectDto;

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -19,7 +19,6 @@ import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import cn.hutool.core.bean.BeanUtil;
 
-import javax.xml.ws.handler.PortInfo;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -30,7 +29,7 @@ import java.util.stream.Collectors;
  * 出入库记录明细 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-20
  */
 @Service

pom.xml

@@ -107,7 +107,13 @@
                 <artifactId>hx-oa</artifactId>
                 <version>${hx.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-customer</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>