fix:新增用户接口修改

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

edu-travel-adapter/edu-travel-adapter-warehouse/src/main/java/edu/travel/adapter/service/warehouse/ShopWarehouseStaffAdapter.java

@@ -0,0 +1,18 @@
+package edu.travel.adapter.service.warehouse;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.dto.ShopWarehouseStaffDto;
+import edu.travel.remote.ShopWarehouseStaffRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ShopWarehouseStaffAdapter {
+    @Autowired
+    private ShopWarehouseStaffRemoteController shopWarehouseStaffRemoteController;
+    @AdapterAnnotation
+    public RPCBaseResponse<Boolean> insertWarehouseStaff(ShopWarehouseStaffDto staffDto){
+        return shopWarehouseStaffRemoteController.insertWarehouseStaff(staffDto);
+    }
+}

edu-travel-api/edu-travel-api-web/src/main/java/edu/travel/controller/ShopMessageController.java

@@ -0,0 +1,33 @@
+package edu.travel.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import edu.travel.adapter.service.commodity.ShopMessageAdapter;
+import edu.travel.remote.dto.MessageDto;
+import edu.travel.remote.vo.MessageVo;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 商城消息表(shop_message)表控制层
+ *
+ * @author xxxxx
+ */
+@RestController
+@RequestMapping("/shopMessage")
+public class ShopMessageController {
+    @Autowired
+    private ShopMessageAdapter shopMessageAdapter;
+
+    /**
+     *  获取消息记录
+     * @param messageDto
+     * @return {@link RPCBaseResponse }<{@link Page }<{@link MessageVo }>>
+     */
+    @GetMapping("/getMessage")
+    public RPCBaseResponse<Page<MessageVo>> getMessage(MessageDto messageDto){
+        return shopMessageAdapter.getMessage(messageDto);
+    }
+}

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/AddOrUpdateTenantDto.java

@@ -41,7 +41,6 @@ public class AddOrUpdateTenantDto {
     /**
      * 性别 0男 1女
      */
-    @NotNull(message = "用户性别不能为空")
     private Integer tenantSex;
 
     /**
@@ -98,7 +97,11 @@ public class AddOrUpdateTenantDto {
     /**
      * 角色列表
      */
+    @NotNull(message = "角色不为空")
     private List<Long> roleIds;
 
-
+    /**
+     * 仓库Id
+     */
+    private String warehouseId;
 }

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/dto/ShopWarehouseStaffDto.java

@@ -20,22 +20,22 @@ public class ShopWarehouseStaffDto extends PagePO {
     /**
      * ID
      */
-    private Long id;
+    private String id;
 
     /**
      * 库房ID
      */
-    private Long warehouseId;
+    private String warehouseId;
 
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 角色
      */
-    private Long roleId;
+    private String roleId;
 
     /**
      * 系统标识

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseStaffRemoteController.java

@@ -0,0 +1,13 @@
+package edu.travel.remote;
+
+import edu.travel.dto.ShopWarehouseStaffDto;
+import edu.travel.rpc.RPCBaseResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(path = "/shopWarehouseStaff", name = "warehouse-dev")
+public interface ShopWarehouseStaffRemoteController {
+    @PostMapping("/insertWarehouseStaff")
+    public RPCBaseResponse<Boolean> insertWarehouseStaff(@RequestBody ShopWarehouseStaffDto staffDto);
+}

edu-travel-service/edu-travel-service-tenement/pom.xml

@@ -155,6 +155,11 @@
             <artifactId>edu-travel-adapter-upload</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-adapter-warehouse</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/ITenantServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import edu.travel.adapter.service.warehouse.ShopWarehouseStaffAdapter;
+import edu.travel.dto.ShopWarehouseStaffDto;
 import edu.travel.remote.feign.mode.dto.tenant.AddOrUpdateTenantDto;
 import edu.travel.remote.feign.mode.dto.tenant.AssignRolesOrMenusDto;
 import edu.travel.remote.feign.mode.vo.tenant.MenuTreeVo;
@@ -37,6 +39,8 @@ public class ITenantServiceImpl extends SysServiceImpl<EduTenantMapper, EduTenan
     private ISysMenuExtraDataService extraDataService;
     @Autowired
     private ISysMenuExtraDataService sysMenuExtraDataService;
+    @Autowired
+    private ShopWarehouseStaffAdapter shopWarehouseStaffAdapter;
     @Override
     public EduTenant getTenantByPhoneNumber(String tenantID) {
         return super.getOneLink(new QueryWrapper<EduTenant>().eq("tenant_phone",tenantID));
@@ -68,6 +72,14 @@ public class ITenantServiceImpl extends SysServiceImpl<EduTenantMapper, EduTenan
         assignRolesOrMenusDto.setId(tenant.getId());
         EduTenant principal = (EduTenant) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         assign(assignRolesOrMenusDto, principal);
+        if(!ObjectUtil.isEmpty(addOrUpdateTenantDto.getWarehouseId())){
+            ShopWarehouseStaffDto shopWarehouseStaffDto = new ShopWarehouseStaffDto();
+            shopWarehouseStaffDto.setUserId(tenant.getId().toString());
+
+            shopWarehouseStaffDto.setWarehouseId(addOrUpdateTenantDto.getWarehouseId());
+
+            shopWarehouseStaffAdapter.insertWarehouseStaff(shopWarehouseStaffDto);
+        }
 
         return tenant;
     }

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseStaffServiceImpl.java

@@ -1,10 +1,11 @@
 package edu.travel.warehouse.service.impl;
 
+import edu.travel.warehouse.service.ShopWarehouseStaffService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.warehouse.mapper.ShopWarehouseStaffMapper;
 import edu.travel.warehouse.entity.ShopWarehouseStaff;
 @Service
-public class ShopWarehouseStaffServiceImpl extends ServiceImpl<ShopWarehouseStaffMapper, ShopWarehouseStaff> {
+public class ShopWarehouseStaffServiceImpl extends ServiceImpl<ShopWarehouseStaffMapper, ShopWarehouseStaff> implements ShopWarehouseStaffService {
 
 }

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/web/ShopWarehouseStaffController.java

@@ -1,13 +1,37 @@
 package edu.travel.warehouse.web;
 
+import cn.hutool.core.bean.BeanUtil;
+import edu.travel.dto.ShopWarehouseStaffDto;
+import edu.travel.remote.ShopWarehouseStaffRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.warehouse.entity.ShopWarehouseStaff;
+import edu.travel.warehouse.service.ShopWarehouseStaffService;
 import edu.travel.web.BaseController;
+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;
 
 
 @RestController
 @RequestMapping("/shopWarehouseStaff")
-class ShopWarehouseStaffController extends BaseController<ShopWarehouseStaff> {
+class ShopWarehouseStaffController extends BaseController<ShopWarehouseStaff> implements ShopWarehouseStaffRemoteController {
+    @Autowired
+    private ShopWarehouseStaffService shopWarehouseStaffService;
+
+    /**
+     *  新增库房人员关联
+     * @return {@link RPCBaseResponse }<{@link Boolean }>
+     */
+    @PostMapping("/insertWarehouseStaff")
+    public RPCBaseResponse<Boolean> insertWarehouseStaff(@RequestBody ShopWarehouseStaffDto staffDto){
+        ShopWarehouseStaff bean = BeanUtil.toBean(staffDto, ShopWarehouseStaff.class);
+        return RPCBaseResponse.success(shopWarehouseStaffService.save(bean));
+    }
+
+
+
+
 
 }