add

fs-admin/src/main/resources/application.yml

@@ -4,6 +4,11 @@ server:
 # Spring配置
 spring:
   profiles:
+#    active: dev
+#    include: common,config-dev
+#    active: druid-hcl
+#    include: common,config-druid-hcl
+#    active: druid-hdt
+#    include: common,config-druid-hdt
     active: dev
-    include: common,config-myhk
-
+    include: common,config-dev

fs-company/src/main/java/com/fs/company/controller/qw/QwUserController.java

@@ -251,6 +251,53 @@ public class QwUserController extends BaseController
     }
 
 
+
+    @PreAuthorize("@ss.hasPermi('qw:user:login')")
+    @PostMapping("/loginQwIpad")
+    public R loginQwIpad(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.loginQwIpad(loginParam);
+    }
+
+
+
+    @PreAuthorize("@ss.hasPermi('qw:user:login')")
+    @PostMapping("/getQwIpad")
+    @RepeatSubmit
+    public R getQwIpad(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.getQwIpad(loginParam);
+    }
+
+    @PreAuthorize("@ss.hasPermi('qw:user:login')")
+    @PostMapping("/delQwIpad")
+    @RepeatSubmit
+    public R delQwIpad(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.delQwIpad(loginParam);
+    }
+
+    @PreAuthorize("@ss.hasPermi('qw:user:login')")
+    @PostMapping("/qrCodeStatus")
+    public R qrCodeStatus(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.qrCodeStatus(loginParam);
+    }
+    //输入验证码
+    @PostMapping("/qrCodeVerify")
+    public R qrCodeVerify(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.qrCodeVerify(loginParam);
+    }
+
+    @PostMapping("/outLoginQwIpad")
+    public R outLoginQwIpad(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.outLoginQwIpad(loginParam);
+    }
+
+    @PostMapping("/twoCode")
+    public R twoCode(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.getTwoCode(loginParam);
+    }
+    @PostMapping("/twoCodeStatus")
+    public R TwoCodeStatus(@RequestBody QwLoginHookParam loginParam){
+        return qwUserService.getTwoCodeStatus(loginParam);
+    }
     /**
      * 企业微信员工账号 绑定 云主机
      */

fs-company/src/main/resources/application.yml

@@ -3,8 +3,8 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-myhk
-    include: common,config-myhk
+    active: dev
+    include: common,config-dev
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
 #    active: druid-hdt

fs-service/src/main/java/com/fs/qw/domain/QwUser.java

@@ -95,5 +95,11 @@ public class QwUser extends BaseEntity
     private  String version;
     private  String unionid;
 
+    private String vid;
+    private String uid;
 
+    private Integer ipadStatus;
+
+    private Long serverId;
+    private Integer serverStatus;
 }

fs-service/src/main/resources/application-common.yml

@@ -36,7 +36,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.fs: info
+    com.fs: debug
     org.springframework: warn
 
 # Spring配置

fs-service/src/main/resources/application-config-dev.yml

@@ -65,3 +65,5 @@ cloud_host:
   company_name: 润天
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
+ipad:
+  ai: 润天

fs-service/src/main/resources/mapper/qw/QwUserMapper.xml

@@ -1,7 +1,7 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.qw.mapper.QwUserMapper">
 
     <resultMap type="QwUser" id="QwUserResult">
@@ -27,10 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="toolStatus"    column="tool_status"    />
         <result property="loginCodeUrl"    column="login_code_url"    />
         <result property="version"    column="version"    />
+        <result property="vid"    column="vid"    />
+        <result property="uid"    column="uid"    />
+        <result property="ipadStatus"    column="ipad_status"    />
+        <result property="serverId"    column="server_id"    />
+        <result property="serverStatus"    column="server_status"    />
     </resultMap>
 
     <sql id="selectQwUserVo">
-        select id, qw_user_id,config_id,contact_way,app_key, qw_user_name, department, openid, company_id, company_user_id, corp_id, status, is_del, welcome_text, welcome_image, is_send_msg,app_key,qw_hook_id,fastGpt_role_id,login_status,tool_status,login_code_url,version from qw_user
+        select id, qw_user_id,server_id,server_status,ipad_status,config_id,vid,uid,contact_way,app_key, qw_user_name, department, openid, company_id, company_user_id, corp_id, status, is_del, welcome_text, welcome_image, is_send_msg,app_key,qw_hook_id,fastGpt_role_id,login_status,tool_status,login_code_url,version from qw_user
     </sql>
 
     <select id="selectQwUserList" parameterType="QwUser" resultMap="QwUserResult">
@@ -75,6 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="batchSelectQwUserByQwUserIdAndCorpId" resultType="QwUser">
+        SELECT qw_user_id, corp_id, qw_user_name
+        FROM qw_user
+        WHERE
+        <foreach collection="data" item="query" open="(" separator=" OR " close=")">
+            (qw_user_id = #{query.qwUserId} AND corp_id = #{query.corpId})
+        </foreach>
+    </select>
+
     <insert id="insertQwUser" parameterType="QwUser" useGeneratedKeys="true" keyProperty="id">
         insert into qw_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,7 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="toolStatus != null">tool_status,</if>
             <if test="loginCodeUrl != null">login_code_url,</if>
             <if test="version != null">version,</if>
-         </trim>
+            <if test="vid != null">vid,</if>
+            <if test="uid != null">uid,</if>
+            <if test="ipadStatus != null">ipad_status,</if>
+            <if test="serverId != null">server_id,</if>
+            <if test="serverStatus != null">server_status,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="qwUserId != null">#{qwUserId},</if>
             <if test="qwUserName != null">#{qwUserName},</if>
@@ -121,7 +140,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loginStatus != null">#{loginStatus},</if>
             <if test="toolStatus != null">#{tool_status},</if>
             <if test="version != null">#{version},</if>
-         </trim>
+            <if test="vid != null">#{vid},</if>
+            <if test="uid != null">#{uid},</if>
+            <if test="ipadStatus != null">#{ipadStatus},</if>
+            <if test="serverId != null">#{serverId},</if>
+            <if test="serverStatus != null">#{serverStatus},</if>
+        </trim>
     </insert>
 
     <update id="updateQwUser" parameterType="QwUser">
@@ -148,6 +172,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="toolStatus != null">tool_status = #{toolStatus},</if>
             <if test="loginCodeUrl != null">login_code_url = #{loginCodeUrl},</if>
             <if test="version != null">version = #{version},</if>
+            <if test="vid != null">`vid` = #{vid},</if>
+            <if test="uid != null">uid = #{uid},</if>
+            <if test="ipadStatus != null">ipad_status = #{ipadStatus},</if>
+            <if test="serverId != null">server_id = #{serverId},</if>
+            <if test="serverStatus != null">server_status = #{serverStatus},</if>
         </trim>
         where id = #{id}
     </update>
@@ -194,4 +223,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{userId}
         </foreach>
     </select>
+
+    <!-- 查询企微用户列表 -->
+    <select id="selectQwUserListByMap" resultType="com.fs.company.vo.OptionVO">
+        select
+        qu.qw_user_name as label,
+        qu.id as value
+        from qw_user qu
+        <where>
+            <if test="params.qwUserName != null and params.qwUserName != ''">
+                and qu.qw_user_name like concat(#{params.qwUserName}, '%')
+            </if>
+        </where>
+    </select>
+    <select id="selectQwWorkTaskList" resultType="com.fs.qw.domain.QwWorkTask">
+        select
+            qwt.id,qwt.ext_id, qwt.qw_user_id, qwt.status, qwt.track_type, qwt.type, qwt.title, qwt.remark, qwt.score, qwt.sop_id,
+            qwt.company_id, qwt.company_user_id, qwt.duration, qwt.create_time, qwt.update_time
+        from qw_work_task qwt
+        where qwt.qw_user_id = #{userId}
+          and date(qwt.create_time) = #{date}
+          and qwt.status = 0
+    </select>
 </mapper>

pom.xml

@@ -238,6 +238,7 @@
         <module>fs-qwhook</module>
         <module>fs-qwhook-sop</module>
         <module>fs-qw-api</module>
+        <module>fs-qw-api-msg</module>
         <module>fs-qw-task</module>
         <module>fs-redis</module>
         <module>fs-watch</module>