扫码签到，直接将签到信息全部保存至签到表

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/dao/FileAttachmentMapper.java

@@ -0,0 +1,10 @@
+package com.lc.ibps.wx.dao;
+
+import com.lc.ibps.wx.entity.FileAttachment;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface FileAttachmentMapper {
+  FileAttachment findByid(@Param("id") String id);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/dao/UserRole.java

@@ -0,0 +1,12 @@
+package com.lc.ibps.wx.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UserRole {
+    List<com.lc.ibps.wx.entity.UserRole> findByUserId(@Param("userId") String userId);
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/dao/UserSituationMapper.java

@@ -0,0 +1,9 @@
+package com.lc.ibps.wx.dao;
+
+import com.lc.ibps.wx.entity.UserSituation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserSituationMapper {
+    UserSituation findByUserId(String id);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/entity/FileAttachment.java

@@ -0,0 +1,30 @@
+package com.lc.ibps.wx.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@TableName(value = "ibps_file_attachment")
+public class FileAttachment implements Serializable {
+    @ApiModelProperty(value = "主键")
+    public String id;
+    @ApiModelProperty(value = "文件名")
+    public String fileName;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/entity/HyqdEntity.java

@@ -39,6 +39,15 @@ public class HyqdEntity implements Serializable {
     protected String  huiYiId; 		/*会议id*/
     @ApiModelProperty(value = "签到时间")
     protected String  qianDaoShiJian; 		/*签到时间*/
+    @ApiModelProperty(value = "部门")
+    protected String  buMen; 		/*部门*/
+    @ApiModelProperty(value = "岗位/角色")
+    protected String  gangWeiJiaoSe; 		/*岗位/角色*/
+    @ApiModelProperty(value = "签字图文")
+    protected String  qianZiTuWen; 		/*签字图文*/
+    @ApiModelProperty(value = "图文名称")
+    protected String  tuWenMingCheng; 		/*图文名称*/
+
     public String getQianDaoShiJian() {
         return qianDaoShiJian;
     }
@@ -135,4 +144,36 @@ public class HyqdEntity implements Serializable {
     public void setHuiYiId(String huiYiId) {
         this.huiYiId = huiYiId;
     }
+
+    public String getBuMen() {
+        return buMen;
+    }
+
+    public void setBuMen(String buMen) {
+        this.buMen = buMen;
+    }
+
+    public String getGangWeiJiaoSe() {
+        return gangWeiJiaoSe;
+    }
+
+    public void setGangWeiJiaoSe(String gangWeiJiaoSe) {
+        this.gangWeiJiaoSe = gangWeiJiaoSe;
+    }
+
+    public String getQianZiTuWen() {
+        return qianZiTuWen;
+    }
+
+    public void setQianZiTuWen(String qianZiTuWen) {
+        this.qianZiTuWen = qianZiTuWen;
+    }
+
+    public String getTuWenMingCheng() {
+        return tuWenMingCheng;
+    }
+
+    public void setTuWenMingCheng(String tuWenMingCheng) {
+        this.tuWenMingCheng = tuWenMingCheng;
+    }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/entity/UserRole.java

@@ -0,0 +1,54 @@
+package com.lc.ibps.wx.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@TableName("ibps_party_user_role")
+public class UserRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    protected String  id;
+
+    @ApiModelProperty(value = "用户id")
+    protected String  userId;
+
+    @ApiModelProperty(value = "角色id")
+    protected String  roleId;
+
+    @ApiModelProperty(value = "创建时间")
+    protected String  createTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/entity/UserSituation.java

@@ -0,0 +1,41 @@
+package com.lc.ibps.wx.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@TableName("t_ryjbqk")
+public class UserSituation implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    protected String  id;
+    @ApiModelProperty(value = "外键")
+    protected String  parentId;
+    @ApiModelProperty(value = "签字图文")
+    protected String  qianZiTuWen;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getQianZiTuWen() {
+        return qianZiTuWen;
+    }
+
+    public void setQianZiTuWen(String qianZiTuWen) {
+        this.qianZiTuWen = qianZiTuWen;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/UserRoleService.java

@@ -0,0 +1,8 @@
+package com.lc.ibps.wx.services;
+
+
+
+public interface UserRoleService {
+
+     String findUserRole(String userid);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/UserSituationService.java

@@ -0,0 +1,7 @@
+package com.lc.ibps.wx.services;
+
+import com.lc.ibps.wx.entity.UserSituation;
+
+public interface UserSituationService {
+    UserSituation findByUserId(String id);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/impl/UserRoleServiceImps.java

@@ -0,0 +1,29 @@
+package com.lc.ibps.wx.services.impl;
+
+import com.lc.ibps.wx.dao.UserRole;
+import com.lc.ibps.wx.services.UserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class UserRoleServiceImps implements UserRoleService {
+
+    @Autowired
+    private UserRole userRole;
+
+    @Override
+    public String findUserRole(String userid) {
+        List<com.lc.ibps.wx.entity.UserRole> userRoleList = userRole.findByUserId(userid);
+        String str = new String();
+        for (int i = 0;i<userRoleList.size();i++){
+            if(i==userRoleList.size()-1){
+                str = userRoleList.get(i).getRoleId();
+            }else{
+                str =userRoleList.get(i).getRoleId()+",";
+            }
+        }
+        return str;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/impl/UserSituationServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lc.ibps.wx.services.impl;
+
+import com.lc.ibps.wx.dao.UserSituationMapper;
+import com.lc.ibps.wx.entity.UserSituation;
+import com.lc.ibps.wx.services.UserSituationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserSituationServiceImpl implements UserSituationService {
+    @Autowired
+    private UserSituationMapper userSituationMapper;
+    @Override
+    public UserSituation findByUserId(String id) {
+        return userSituationMapper.findByUserId(id);
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/impl/wxServicesImpl.java

@@ -12,11 +12,14 @@ import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.redis.utils.RedisUtil;
 import com.lc.ibps.config.JcjdConfig;
 import com.lc.ibps.org.party.persistence.entity.PartyEmployeePo;
+import com.lc.ibps.sysdata.dao.UpdateDataTableDao;
+import com.lc.ibps.wx.dao.FileAttachmentMapper;
 import com.lc.ibps.wx.dao.HyqdDao;
+import com.lc.ibps.wx.dao.UserRole;
 import com.lc.ibps.wx.dao.WxyhDao;
-import com.lc.ibps.wx.entity.HyqdEntity;
-import com.lc.ibps.wx.entity.Token;
-import com.lc.ibps.wx.entity.WxUserEntity;
+import com.lc.ibps.wx.entity.*;
+import com.lc.ibps.wx.services.UserRoleService;
+import com.lc.ibps.wx.services.UserSituationService;
 import com.lc.ibps.wx.services.wxServices;
 
 
@@ -52,6 +55,14 @@ public class wxServicesImpl implements wxServices {
     HyqdDao hyqdDao;
     @Autowired
     WxyhDao wxyhDao;
+    @Autowired
+    UpdateDataTableDao updateDataTableDao;
+    @Autowired
+    UserRoleService userRoleService;
+    @Autowired
+    UserSituationService userSituationService;
+    @Autowired
+    FileAttachmentMapper fileAttachmentMapper;
 
     public APIResult<Void> openId(@RequestParam String code, @RequestParam String state) {
         APIResult<Void> apiResult = new APIResult<>();
@@ -177,44 +188,34 @@ public class wxServicesImpl implements wxServices {
         }
         else { //查询到系统用户 ,保存微信用户 并签到
             //查询该系统用户是否已被其它人注册
-
-
             PartyEmployeePo employeePo = result.get(0);
-
-
-
             WxUserEntity wxUser = new WxUserEntity();
             wxUser.setId(IdUtil.simpleUUID());
             wxUser.setOpenid(map.get("openid").toString());
             wxUser.setXingMing(employeePo.getName());
             wxUser.setShouJi(employeePo.getMobile());
-
             //查询该系统用户是否已被其它人注册
             List<WxUserEntity> entities = wxyhDao.selects(wxUser);
-
             if (entities==null || entities.size()>1){
                 apiResult.setState(JcjdConfig.error);
                 apiResult.setMessage("该用户已被注册:"+employeePo.getName()+"  "+employeePo.getMobile());
                 return apiResult;
             }
-
-            System.out.println(JSON.toJSONString(wxUser));
-
-
-
-
-
             wxyhDao.add(wxUser); //保存用户
-
             HyqdEntity hyqd = new HyqdEntity();
             hyqd.setId(IdUtil.simpleUUID());
-            hyqd.setShouJi(employeePo.getMobile());
-            hyqd.setHuiYiChangJing(map.get("state").toString());
-            hyqd.setQianDaoRenYuan(employeePo.getName());
+            hyqd.setShouJi(employeePo.getMobile());  //手机号
+            hyqd.setHuiYiChangJing(map.get("state").toString());  //场景id
+            hyqd.setQianDaoRenYuan(employeePo.getName());  //用户名
             hyqd.setQianDaoShiJian(DateUtil.now()); //存放签到时间
-
+            hyqd.setBuMen(employeePo.getPositions());//部门
+            String role = userRoleService.findUserRole(employeePo.getId());
+            hyqd.setGangWeiJiaoSe(!role.isEmpty() ? role:""); //角色
+            UserSituation user = userSituationService.findByUserId(hyqd.getId());
+            FileAttachment file = fileAttachmentMapper.findByid(user.getQianZiTuWen());
+            hyqd.setQianZiTuWen(!file.getId().isEmpty()?file.getId():"");//签字图文
+            hyqd.setTuWenMingCheng(!file.fileName.isEmpty()?file.fileName:"");//图文名称
             hyqdDao.add(hyqd);
-
             apiResult.setMessage("签到成功!");
             apiResult.setState(JcjdConfig.successful);
         }

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/FileAttachment.xml

@@ -0,0 +1,23 @@
+<?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.lc.ibps.wx.dao.FileAttachmentMapper">
+    <!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
+    <resultMap id="FileAttachment" type="com.lc.ibps.wx.entity.FileAttachment">
+        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <result property="fileName" column="FILE_NAME_" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="columns">
+        ID_,FILE_NAME_
+    </sql>
+
+    <select id="findByid" resultMap="FileAttachment">
+        select (<include refid="columns"/>) from ibps_file_attachment where ID_ = #{id,jdbcType=VARCHAR}
+
+
+    </select>
+
+
+
+
+</mapper>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/Hyqdmapper.xml

@@ -15,10 +15,14 @@
 		<result property="huiYiChangJing" column="HUI_YI_CHANG_JING" jdbcType="VARCHAR"/>
 		<result property="huiYiId" column="HUI_YI_ID_" jdbcType="VARCHAR"/>
 		<result property="qianDaoShiJian" column="qian_dao_shi_jian" jdbcType="VARCHAR"/>
+		<result property="buMen" column="BU_MEN_" jdbcType="VARCHAR"/>
+		<result property="gangWeiJiaoSe" column="GANG_WEI_JIAO_SE_" jdbcType="VARCHAR"/>
+		<result property="qianZiTuWen" column="QIAN_ZI_TU_WEN_" jdbcType="VARCHAR"/>
+		<result property="tuWenMingCheng" column="TU_WEN_MING_CHENG" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,QIAN_DAO_REN_YUAN,SHOU_JI_,HUI_YI_CHANG_JING,HUI_YI_ID_,qian_dao_shi_jian
+		ID_,TENANT_ID_,IP_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,QIAN_DAO_REN_YUAN,SHOU_JI_,HUI_YI_CHANG_JING,HUI_YI_ID_,qian_dao_shi_jian,BU_MEN_,GANG_WEI_JIAO_SE_,QIAN_ZI_TU_WEN_,TU_WEN_MING_CHENG
 
 	</sql>
 	
@@ -27,7 +31,7 @@
 		(<include refid="columns"/>)
 		VALUES 
 		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},  #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{qianDaoRenYuan,jdbcType=VARCHAR}, #{shouJi,jdbcType=VARCHAR}, #{huiYiChangJing,jdbcType=VARCHAR}, #{huiYiId,jdbcType=VARCHAR}
-		, #{qianDaoShiJian,jdbcType=VARCHAR})
+		, #{qianDaoShiJian,jdbcType=VARCHAR},#{buMen,jdbcType=VARCHAR},#{gangWeiJiaoSe,jdbcType=VARCHAR},#{qianZiTuWen,jdbcType=VARCHAR},#{tuWenMingCheng,jdbcType=VARCHAR})
 	</insert>
 
 	

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UserRole.xml

@@ -0,0 +1,25 @@
+<?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.lc.ibps.wx.dao.UserRole">
+    <!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
+    <resultMap id="UserRole" type="com.lc.ibps.wx.entity.UserRole">
+        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <result property="userId" column="USER_ID_" jdbcType="VARCHAR"/>
+        <result property="roleId" column="ROLE_ID_" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME_" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="columns">
+        ID_,USER_ID_,IP_,ROLE_ID_,CREATE_TIME_
+    </sql>
+
+    <select id="findByUserId" resultMap="UserRole">
+        select (<include refid="columns"/>) from ibps_party_user_role where USER_ID_ = #{userId,jdbcType=VARCHAR}
+
+
+    </select>
+
+
+
+
+</mapper>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UserSituation.xml

@@ -0,0 +1,19 @@
+<?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.lc.ibps.wx.dao.UserSituationMapper">
+    <!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
+    <resultMap id="UserSituation" type="com.lc.ibps.wx.entity.UserSituation">
+        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR"/>
+        <result property="qianZiTuWen" column="QIAN_ZI_TU_WEN_" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="columns">
+        ID_,PARENT_ID_,QIAN_ZI_TU_WEN_
+    </sql>
+
+    <select id="findByUserId" resultMap="UserSituation">
+        select (<include refid="columns"/>) from t_ryjbqk where ID_ = #{userId,jdbcType=VARCHAR}
+    </select>
+
+</mapper>