杰生重构

hx-service-api/blade-ex-api/pom.xml

@@ -16,4 +16,13 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
 </project>

hx-service-api/blade-ex-api/src/main/java/com/fjhx/feign/IUserClient.java

@@ -0,0 +1,28 @@
+package com.fjhx.feign;
+
+import com.fjhx.constants.ClientConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.user.entity.User;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 用户 Feign接口类
+ */
+@FeignClient(value = "blade-ex")
+public interface IUserClient {
+
+    String GET_USER_LIST_BY_ROLE_ID_LIST = ClientConstant.API_PREFIX + "/getUserListByRoleIdList";
+
+    /**
+     * 根据角色id列表获取用户列表
+     *
+     * @param roleIdList 角色id List
+     */
+    @PostMapping(GET_USER_LIST_BY_ROLE_ID_LIST)
+    R<List<User>> getUserListByRoleIdList(@RequestBody List<Long> roleIdList);
+
+}

hx-service-api/pom.xml

@@ -64,6 +64,12 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-user-api</artifactId>
+                <version>${bladex.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

hx-service/blade-ex/src/main/java/com/fjhx/feign/UserClient.java

@@ -0,0 +1,27 @@
+package com.fjhx.feign;
+
+import com.fjhx.service.IUserService;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.user.entity.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+@ApiIgnore
+@RestController
+public class UserClient implements IUserClient {
+
+    @Autowired
+    private IUserService userService;
+
+    @PostMapping(GET_USER_LIST_BY_ROLE_ID_LIST)
+    @Override
+    public R<List<User>> getUserListByRoleIdList(List<Long> roleIdList) {
+        List<User> result = userService.getUserListByRoleIdList(roleIdList);
+        return R.success(result);
+    }
+
+}

hx-service/blade-ex/src/main/java/com/fjhx/service/IUserService.java

@@ -19,6 +19,8 @@ package com.fjhx.service;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.system.user.entity.User;
 
+import java.util.List;
+
 /**
  * 服务类
  *
@@ -26,4 +28,6 @@ import org.springblade.system.user.entity.User;
  */
 public interface IUserService extends BaseService<User> {
 
+    List<User> getUserListByRoleIdList(List<Long> roleIdList);
+
 }

hx-service/blade-ex/src/main/java/com/fjhx/service/impl/UserServiceImpl.java

@@ -16,6 +16,8 @@
  */
 package com.fjhx.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.mapper.UserMapper;
 import com.fjhx.service.IUserService;
 import lombok.AllArgsConstructor;
@@ -23,6 +25,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.system.user.entity.User;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 服务实现类
  *
@@ -33,4 +37,15 @@ import org.springframework.stereotype.Service;
 public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserService {
 
 
+    @Override
+    public List<User> getUserListByRoleIdList(List<Long> roleIdList) {
+
+        LambdaQueryWrapper<User> wrapper = Wrappers.lambdaQuery();
+
+        for (Long roleId : roleIdList) {
+            wrapper.like(User::getRoleId, roleId).or();
+        }
+
+        return list(wrapper);
+    }
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBackServiceImpl.java

@@ -136,6 +136,7 @@ public class WaterBackServiceImpl extends ServiceImpl<WaterBackMapper, WaterBack
         waterBackDetailsService.remove(WaterBackDetails::getWaterBackId, waterBackId);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void submit(WaterBackVo waterBackVo) {
         Long waterBackId = waterBackVo.getId();