小程序端船主上传船舶证书图片

snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java

@@ -254,6 +254,10 @@ public abstract class SaBaseLoginUser {
 
     private String unionId;
 
+    /***船主证书图片信息*/
+    private String unloadImg;
+    private String unloadName;
+
     /** 是否可登录，由继承类实现 */
     public abstract Boolean getEnabled();
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java

@@ -306,18 +306,31 @@ public class BizUserController {
     }
 
     /**
-     * 获取人员分页
+     * 获取司机分页
      *
      * @author xuyuxiang
      * @date 2022/4/24 20:00
      */
-    @Operation(summary = "获取人员分页")
+    @Operation(summary = "获取司机分页")
     @SaCheckPermission("/biz/user/driverPage")
     @GetMapping("/biz/user/driverPage")
     public CommonResult<Page<BizUser>> driverPage(BizUserPageParam bizUserPageParam) {
         return CommonResult.data(bizUserService.driverPage(bizUserPageParam));
     }
 
+    /**
+     * 获取船主分页
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @Operation(summary = "获取船主分页")
+    @SaCheckPermission("/biz/user/shipPage")
+    @GetMapping("/biz/user/shipPage")
+    public CommonResult<Page<BizUser>> shipPage(BizUserPageParam bizUserPageParam) {
+        return CommonResult.data(bizUserService.shipPage(bizUserPageParam));
+    }
+
 
     /**
      * 小程序注册

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/entity/BizUser.java

@@ -295,4 +295,8 @@ public class BizUser extends CommonEntity {
     private String openId;
 
     private String unionId;
+
+    /***船主证书图片信息*/
+    private String unloadImg;
+    private String unloadName;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserMiniAddParam.java

@@ -17,6 +17,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 人员添加参数
  *
@@ -164,4 +166,13 @@ public class BizUserMiniAddParam {
     /** 扩展信息 */
     @Schema(description = "扩展信息")
     private String extJson;
+
+    /** 角色类型   1司机   2船主 */
+    @Schema(description = "角色类型")
+    private String roleName;
+
+    /***船主证书图片*/
+    private List<String> filePathList;
+    private List<String> fileNameList;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserMiniEditParam.java

@@ -17,6 +17,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 人员编辑参数
  *
@@ -176,4 +178,8 @@ public class BizUserMiniEditParam {
     /** 扩展信息 */
     @Schema(description = "扩展信息")
     private String extJson;
+
+    /***船主证书图片*/
+    private List<String> filePathList;
+    private List<String> fileNameList;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java

@@ -58,6 +58,8 @@ public interface BizUserService extends IService<BizUser> {
      */
     Page<BizUser> driverPage(BizUserPageParam bizUserPageParam);
 
+    Page<BizUser> shipPage(BizUserPageParam bizUserPageParam);
+
 
     /**
      * 添加人员

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -239,7 +239,25 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
             queryWrapper.eq("a.USER_STATUS",bizUserPageParam.getUserStatus());
         }
         queryWrapper.eq("a.DELETE_FLAG","NOT_DELETE");
-        queryWrapper.eq("sr.TARGET_ID",devConfigApi.getValueByKey("MINI_ROLE_ID"));
+        queryWrapper.eq("sr.TARGET_ID",devConfigApi.getValueByKey("MINI_ROLE_DRIVER"));
+        queryWrapper.orderByDesc("a.CREATE_TIME");
+        // 排除超管
+        queryWrapper.lambda().ne(BizUser::getAccount, BizBuildInEnum.BUILD_IN_USER_ACCOUNT.getValue());
+        return this.baseMapper.driverPage(CommonPageRequest.defaultPage(), queryWrapper);
+    }
+
+    @Override
+    public Page<BizUser> shipPage(BizUserPageParam bizUserPageParam) {
+        QueryWrapper<BizUser> queryWrapper = new QueryWrapper<BizUser>().checkSqlInjection();
+        if (ObjectUtil.isNotEmpty(bizUserPageParam.getSearchKey())) {
+            queryWrapper.and(q -> q.like("a.ACCOUNT", bizUserPageParam.getSearchKey())
+                    .or().like("a.NAME", bizUserPageParam.getSearchKey()));
+        }
+        if(ObjectUtil.isNotEmpty(bizUserPageParam.getUserStatus())){
+            queryWrapper.eq("a.USER_STATUS",bizUserPageParam.getUserStatus());
+        }
+        queryWrapper.eq("a.DELETE_FLAG","NOT_DELETE");
+        queryWrapper.eq("sr.TARGET_ID",devConfigApi.getValueByKey("MINI_ROLE_SHIP"));
         queryWrapper.orderByDesc("a.CREATE_TIME");
         // 排除超管
         queryWrapper.lambda().ne(BizUser::getAccount, BizBuildInEnum.BUILD_IN_USER_ACCOUNT.getValue());
@@ -829,8 +847,28 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         bizUser.setUserStatus(BizUserStatusEnum.ENABLE.getValue());
 
         this.save(bizUser);
-        //默认司机角色
-        sysUserApi.grantRole(bizUser.getId(), Arrays.asList(devConfigApi.getValueByKey("MINI_ROLE_ID")));
+
+        if("1".equals(bizUserAddParam.getRoleName())){
+            //司机角色
+            sysUserApi.grantRole(bizUser.getId(), Arrays.asList(devConfigApi.getValueByKey("MINI_ROLE_DRIVER")));
+        }else{
+            //船主角色
+            if(ObjectUtil.isNotEmpty(bizUserAddParam.getFilePathList())){
+                StringBuffer buffer = new StringBuffer();
+                for(String url : bizUserAddParam.getFilePathList()){
+                    buffer.append(url.replace(devConfigApi.getValueByKey("BACKEND_URL"),"")+",");
+                }
+                bizUser.setUnloadImg(buffer.substring(0,buffer.length()-1));
+            }
+            if(ObjectUtil.isNotEmpty(bizUserAddParam.getFileNameList())){
+                StringBuffer buffer = new StringBuffer();
+                for(String name : bizUserAddParam.getFileNameList()){
+                    buffer.append(name+",");
+                }
+                bizUser.setUnloadName(buffer.substring(0,buffer.length()-1));
+            }
+            sysUserApi.grantRole(bizUser.getId(), Arrays.asList(devConfigApi.getValueByKey("MINI_ROLE_SHIP")));
+        }
 
         // 发布增加事件
         CommonDataChangeEventCenter.doAddWithData(BizDataTypeEnum.USER.getValue(), JSONUtil.createArray().put(bizUser));
@@ -841,6 +879,22 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
     public void miniEdit(BizUserMiniEditParam bizUserEditParam) {
         BizUser bizUser = this.queryEntity(bizUserEditParam.getId());
         BeanUtil.copyProperties(bizUserEditParam, bizUser);
+
+        //船主角色
+        if(ObjectUtil.isNotEmpty(bizUserEditParam.getFilePathList())){
+            StringBuffer buffer = new StringBuffer();
+            for(String url : bizUserEditParam.getFilePathList()){
+                buffer.append(url.replace(devConfigApi.getValueByKey("BACKEND_URL"),"")+",");
+            }
+            bizUser.setUnloadImg(buffer.substring(0,buffer.length()-1));
+        }
+        if(ObjectUtil.isNotEmpty(bizUserEditParam.getFileNameList())){
+            StringBuffer buffer = new StringBuffer();
+            for(String name : bizUserEditParam.getFileNameList()){
+                buffer.append(name+",");
+            }
+            bizUser.setUnloadName(buffer.substring(0,buffer.length()-1));
+        }
         this.updateById(bizUser);
 
         // 发布更新事件

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -295,4 +295,8 @@ public class SysUser extends CommonEntity {
     private String openId;
 
     private String unionId;
+
+    /***船主证书图片信息*/
+    private String unloadImg;
+    private String unloadName;
 }