瀏覽代碼

场景上传 查询用户改为根据ryid查询警员

dsx 1 年之前
父節點
當前提交
78ae5a9652

+ 66 - 0
src/main/java/com/fdkankan/contro/entity/JyUser.java

@@ -0,0 +1,66 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Getter
+@Setter
+@TableName("jy_user")
+public class JyUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 人员id
+     */
+    @TableField("ry_id")
+    private String ryId;
+
+    /**
+     * 密码
+     */
+    @TableField("ry_password")
+    private String ryPassword;
+
+    /**
+     * 编号
+     */
+    @TableField("ry_no")
+    private String ryNo;
+
+    @TableField("ry_nick_name")
+    private String ryNickName;
+
+    @TableField("user_id")
+    private Integer userId;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 18 - 0
src/main/java/com/fdkankan/contro/mapper/IJyUserMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.contro.entity.JyUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Mapper
+public interface IJyUserMapper extends BaseMapper<JyUser> {
+
+}

+ 20 - 0
src/main/java/com/fdkankan/contro/service/IJyUserService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.entity.JyUser;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+public interface IJyUserService extends IService<JyUser> {
+
+    JyUser getByUserName(String userName);
+
+    JyUser getByRyId(String userName);
+
+}

+ 31 - 0
src/main/java/com/fdkankan/contro/service/impl/JyUserServiceImpl.java

@@ -0,0 +1,31 @@
+package com.fdkankan.contro.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.entity.JyUser;
+import com.fdkankan.contro.mapper.IJyUserMapper;
+import com.fdkankan.contro.service.IJyUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-11
+ */
+@Service
+public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implements IJyUserService {
+
+    @Override
+    public JyUser getByUserName(String userName) {
+        return this.getOne(new LambdaQueryWrapper<JyUser>().eq(JyUser::getRyNo, userName));
+    }
+
+    @Override
+    public JyUser getByRyId(String ryId) {
+        return this.getOne(new LambdaQueryWrapper<JyUser>().eq(JyUser::getRyId, ryId));
+    }
+
+}

+ 6 - 2
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -223,6 +223,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Autowired
     IJySceneAuthService jySceneAuthService;
 
+    @Autowired
+    private IJyUserService jyUserService;
+
     @Override
     public SceneFileBuild findByFileId(String fileId) {
 
@@ -2180,8 +2183,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     params.put("password", AesUtil.encryptCBC(customUserPwd, userPasswordKey, userPasswordIv, AesUtil.ALMODE_CBC_NOPADDING));
                     String url = fdServiceUrl.concat(URL_ADD_UCENTER_USER);
                     myClient.post(url, params);
-                    User user = userService.getByUserName(customUserName);
-                    if(Objects.isNull(user)){
+                    JyUser jyUser = jyUserService.getByRyId(customUserId);
+                    User user = userService.getById(jyUser.getUserId());
+                    if(Objects.isNull(jyUser)){
                         throw new RuntimeException("注册用户失败");
                     }