lyhzzz hai 2 meses
pai
achega
89bcaf7b84

+ 93 - 0
src/main/java/com/fdkankan/fusion/entity/JyUser.java

@@ -0,0 +1,93 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-05-27
+ */
+@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 Long userId;
+
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0禁用,1正常
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 手机号码
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 身份证
+     */
+    @TableField("id_card")
+    private String idCard;
+
+    /**
+     * 是否江门 0 否,1是
+     */
+    @TableField("is_jm")
+    private Integer isJm;
+
+    @TableField("platform_id")
+    private Integer platformId;
+
+
+}

+ 2 - 2
src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "t_ai_content"
+               "jy_user"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -48,7 +48,7 @@ public class AutoGenerate {
     public static void  generate(String path,String moduleName,  List<String> tables){
 //        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion_xj",
 //                "root","mysql123!ROOT.")
-        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion",
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/4dkankan_v4",
                 "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者

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

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

+ 13 - 5
src/main/java/com/fdkankan/fusion/mq/consumer/CaseAddSceneConsumer.java

@@ -3,10 +3,7 @@ package com.fdkankan.fusion.mq.consumer;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.fusion.entity.CaseEntity;
-import com.fdkankan.fusion.entity.ScenePlus;
-import com.fdkankan.fusion.entity.ScenePlusExt;
-import com.fdkankan.fusion.entity.User;
+import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.mq.vo.LaserSceneGpsVo;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.SceneNumParam;
@@ -39,6 +36,8 @@ public class CaseAddSceneConsumer {
     ICaseService caseService;
     @Autowired
     IUserService userService;
+    @Autowired
+    IJyUserService jyUserService;
 
     @RabbitListener(
             queuesToDeclare = @Queue("${queue.fusion.case-add:queue-aj-add-scene}")
@@ -63,10 +62,19 @@ public class CaseAddSceneConsumer {
             CaseEntity caseEntity = caseService.getKnumber(kNumber);
             if(caseEntity == null){
                 User user = userService.getById(scenePlus.getUserId());
+                if(user == null){
+                    log.info("queue-aj-add-scene------user为空:{},{}",num,kNumber);
+                    return;
+                }
+                JyUser jyUser = jyUserService.getByUserId(user.getId());
+                if(jyUser == null){
+                    log.info("queue-aj-add-scene------jyUser为空:{},{}",num,kNumber);
+                    return;
+                }
                 caseEntity = new CaseEntity();
                 caseEntity.setCaseTitle(kNumber);
                 caseEntity.setUserName(user.getUserName());
-                caseEntity.setSysUserId(user.getSysUserId());
+                caseEntity.setSysUserId(jyUser.getSysUserId());
                 caseService.save(caseEntity);
             }
 

+ 17 - 0
src/main/java/com/fdkankan/fusion/service/IJyUserService.java

@@ -0,0 +1,17 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.JyUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-05-27
+ */
+public interface IJyUserService extends IService<JyUser> {
+
+    JyUser getByUserId(Long userId);
+}

+ 35 - 0
src/main/java/com/fdkankan/fusion/service/impl/JyUserServiceImpl.java

@@ -0,0 +1,35 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.JyUser;
+import com.fdkankan.fusion.mapper.IJyUserMapper;
+import com.fdkankan.fusion.service.IJyUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-05-27
+ */
+@Service
+@DS("db2")
+public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implements IJyUserService {
+
+    @Override
+    public JyUser getByUserId(Long userId) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getUserId,userId);
+        List<JyUser> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+    }
+}

+ 5 - 0
src/main/resources/mapper/fusion/JyUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.fusion.mapper.IJyUserMapper">
+
+</mapper>