人员信息同步完成

src/main/java/com/usky/dxtop/model/Dept.java

@@ -29,22 +29,34 @@ public class Dept implements Serializable {
      * id
      */
     private String id;
-
+    /**
+     * 分页数
+     */
     private Integer deptSort;
-
+    /**
+     * 是否启用
+     */
     private Integer enabled;
-
+    /**
+     * 子节点个数
+     */
     private Integer subCount;
-
+    /**
+     * 是否有子节点
+     */
     private Integer hasChildren;
 
     /**
-     * 部门
+     * 部门描述
      */
     private String label;
-
+    /**
+     * 部门名称
+     */
     private String name;
-
+    /**
+     * 上级部门编码
+     */
     private String pid;
 
     private Integer leaf;

src/main/java/com/usky/dxtop/model/Staff.java

@@ -1,7 +1,6 @@
 package com.usky.dxtop.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,59 +26,109 @@ public class Staff implements Serializable {
 
     @TableId
     private Long sId;
+    /**
+     * 卡号
+      */
+    @JSONField(name = "cardid")
+    private String cardId;
+    /**
+     * 手机号
+     */
+    private String contacts;
+    /**
+     * 部门
+     */
+    private String dept;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 邮箱
+     */
+    @JSONField(name = "faceid")
+    private String faceId;
+
 
     /**
      * id
      */
     private String id;
 
-    private Integer deptSort;
 
-    private Integer enabled;
+    /**
+     * 是否是审核人
+     */
+    private Boolean isApprover;
 
-    private Integer subCount;
+    /**
+     * 岗位
+     */
+    private String jobs;
 
-    private Integer hasChildren;
+    /**
+     * 姓名
+     */
+    private String name;
 
     /**
-     * 部门
+     * 角色信息
      */
-    private String label;
+    private String roles;
 
-    private String name;
 
-    private String pid;
+    /**
+     * 性别
+     */
+    private String sex;
 
-    private Integer leaf;
 
-    private Date createTime;
 
     /**
      * 创建人
      */
     private String createBy;
 
+
+    /**
+     * 修改人
+     */
     private String updateBy;
 
-    private Date updateTime;
-    @TableField(exist = false)
-    private String deptName;
 
-    @TableField(exist = false)
-    private String identity;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 
     /**
-     * 到账比例
+     * 修改时间
      */
-    @TableField(exist = false)
-    private Double proportion;
-    @JSONField(name = "cardid")
-    private String card;
+    private String updateTime;
 
-    @JSONField(name = "faceid")
-    private String face;
+    /**
+     * 部门id
+     */
+    private String deptId;
 
-    @TableField(exist = false)
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 身份信息
+     */
+    private String identity;
+    /**
+     * 到账比例
+     */
+    private Double proportion;
+    /**
+     * 身份信息主键
+     */
     private Long radioId;
 
 

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -673,8 +673,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //添加卡号
             Staff staff = staffService.getById(order.getUserId());
             Optional.ofNullable(staff).orElseThrow(() -> new CustomException("卡号不能为空"));
-            Optional.ofNullable(staff.getCard()).orElseThrow(() -> new CustomException("卡号不能为空"));
-            order.setCard(staff.getCard());
+            Optional.ofNullable(staff.getCardId()).orElseThrow(() -> new CustomException("卡号不能为空"));
+            order.setCard(staff.getCardId());
         }else {
             Assert.check(null != order.getChannelId() && 0 != order.getChannelId(),"渠道编号不能为空");
             TopChannel topChannel = topChannelService.getById(order.getChannelId());

src/main/java/com/usky/dxtop/service/job/SmJob.java

@@ -18,6 +18,7 @@ import com.usky.dxtop.service.config.rabbitmq.group.GroupConsumeConfig;
 import com.usky.dxtop.service.config.rabbitmq.profile.ProfileConsumeConfig;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.core.util.JsonUtils;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +90,8 @@ public class SmJob {
                 LambdaQueryWrapper<Staff> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(Staff::getId,date.getId());
                 Staff staff = staffService.getOne(queryWrapper);
+                Map dept = JSON.parseObject(date.getDept(), Map.class);
+                date.setDeptId(dept.get("id").toString());
                 int type;
                 if (null == staff){
                     type = 1;
@@ -170,10 +173,11 @@ public class SmJob {
         Map<String,Object> map = new HashMap<>();
         map.put("type",type);
         map.put("card_type",1);
-        map.put("card",staff.getCard());
+        map.put("card",staff.getCardId());
         map.put("name",staff.getName());
         map.put("mob",staff.getId());
-        map.put("groupid",staff.getPid());
+        Map dept = JSON.parseObject(staff.getDept(), Map.class);
+        map.put("groupid",dept.get("id"));
         map.put("tel","");
         map.put("level_name","");
         MsgLog msgLog = new MsgLog();
@@ -216,7 +220,7 @@ public class SmJob {
     private void faceSendMessage(Staff staff){
         Map<String,Object> map = new HashMap<>();
         map.put("mob",staff.getId());
-        map.put("image",staff.getFace());
+        map.put("image",staff.getFaceId());
         faceRabbitTemplate.convertAndSend(FaceConsumeConfig.NAME, FaceConsumeConfig.NAME, map);
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(staff.getSId());

src/main/resources/mapper/StaffMapper.xml

@@ -2,27 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usky.dxtop.mapper.StaffMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dxtop.model.Staff">
-        <id column="id" property="id" />
-        <result column="dept_sort" property="deptSort" />
-        <result column="enabled" property="enabled" />
-        <result column="sub_count" property="subCount" />
-        <result column="has_children" property="hasChildren" />
-        <result column="label" property="label" />
-        <result column="name" property="name" />
-        <result column="pid" property="pid" />
-        <result column="leaf" property="leaf" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
+
     <select id="page" resultType="com.usky.dxtop.model.Staff">
         select s.*,d.name as deptName,tr.identity,tr.proportion,tr.id as radioId
         from staff as s
         left join dept as d
-        on s.pid = d.d_id
+        on s.dept_id = d.id
         left join staff_radio as sr
         on s.s_id = sr.staff_id and sr.del_flag = 0
         left join top_radio as tr
@@ -35,12 +20,13 @@
                 and s.name like concat('%', #{name}, '%')
             </if>
             <if test="phone !=null and phone != ''">
-                and s.name like concat('%', #{phone}, '%')
+                and s.contacts like concat('%', #{phone}, '%')
             </if>
             <if test="card !=null and card != ''">
-                and s.name like concat('%', #{card}, '%')
+                and s.card_id like concat('%', #{card}, '%')
             </if>
         </where>
+        order by s.id desc
     </select>
 
 </mapper>