Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -487,4 +487,18 @@ public class SocialController extends BaseController {
         return response;
     }
 
+    @ApiOperation(value = "签到扫码", notes = "签到扫码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "activityId:活动id"),
+    })
+
+    @RequestMapping(value = "/tpactivitysignin/add", method = RequestMethod.GET)
+    public ResponseBean  TpActivitySignInAdd(HttpSession session,@RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.TpActivitySignInAdd(paramets,userElement);
+        return response;
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

@@ -0,0 +1,20 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpActivitySignIn;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpActivitySignInMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpActivitySignIn record);
+
+    int insertSelective(TpActivitySignIn record);
+
+    TpActivitySignIn selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpActivitySignIn record);
+
+    int updateByPrimaryKey(TpActivitySignIn record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java

@@ -25,6 +25,39 @@ public class TaUserVerify {
 
     private Date createDate;
 
+    /**
+     * 期
+     */
+    private  String phaseName;
+
+    /**
+     * 栋
+     */
+    private  String buildingName;
+
+    /**
+     * 单元
+     */
+    private  String unitName;
+
+    /**
+     * 楼层
+     */
+    private  String levelName;
+
+    /**
+     * 房间号
+     */
+    private  String roomNoName;
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
+    }
+
     /**
      * 审核人姓名
      */
@@ -50,6 +83,7 @@ public class TaUserVerify {
     /**
      * 小区 省市区
      */
+
     private String communityAddress;
 
     public Integer getId() {
@@ -179,4 +213,36 @@ public class TaUserVerify {
     public void setCommunityAddress(String communityAddress) {
         this.communityAddress = communityAddress;
     }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignIn.java

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+
+import java.util.Date;
+public class TpActivitySignIn {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer activityId;
+
+    private String userName;
+
+    private String userRole;
+
+    private String buildingInfo;
+
+    private Integer taUserId;
+
+    private String userTel;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole == null ? null : userRole.trim();
+    }
+
+    public String getBuildingInfo() {
+        return buildingInfo;
+    }
+
+    public void setBuildingInfo(String buildingInfo) {
+        this.buildingInfo = buildingInfo == null ? null : buildingInfo.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel == null ? null : userTel.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -206,4 +206,12 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean userTransactionList(UserElement userElement,Integer pageNum,Integer paeSize);
+
+	/**
+	 * 扫码签到
+	 * @param paramets
+	 * @param userElement
+	 * @return
+	 */
+    ResponseBean TpActivitySignInAdd(String paramets, UserElement userElement);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -91,6 +91,15 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private  TpTransactionLikeMapper tpTransactionLikeMapper;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    @Autowired
+    private  TpActivitySignInMapper tpActivitySignInMapper;
+
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -652,6 +661,31 @@ public class SocialServiceImpl implements SocialServiceI {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean TpActivitySignInAdd(String paramets, UserElement userElement) {
+        ResponseBean responseBean= new ResponseBean();
+        Integer activityId= JSONObject.parseObject(paramets).getInteger("activityId");
+        TpActivitySignIn tpActivitySignIn= new TpActivitySignIn();
+        tpActivitySignIn.setId(activityId);
+        tpActivitySignIn.setCommunityId(userElement.getCommunityId());
+
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+
+        String description= taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
+        tpActivitySignIn.setUserRole(description);
+        tpActivitySignIn.setUserName(userElement.getUserName());
+        //期/栋/单/层/户
+        String bu=taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName();
+        tpActivitySignIn.setBuildingInfo(bu);
+        tpActivitySignIn.setTaUserId(userElement.getId());
+        tpActivitySignIn.setUserTel(userElement.getLoginName());
+        tpActivitySignIn.setCreateDate(new Date());
+        tpActivitySignInMapper.insert(tpActivitySignIn);
+
+
+        return null;
+    }
+
 
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {

CODE/smart-community/app-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -14,10 +14,15 @@
     <result column="verify_status" property="verifyStatus" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="verify_name" property="verifyName"/>
+    <result column="phase_name" property="phaseName"/>
+    <result column="building_name" property="buildingName"/>
+    <result column="unit_name" property="unitName"/>
+    <result column="level_name" property="levelName"/>
+    <result column="room_no_name" property="roomNoName"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_id, community_id, role_id, phase, building, unit, level, room_no, verify_status, 
-     create_date, verify_name
+     create_date, verify_name, phase_name, building_name, unit_name, room_no_name,level_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignInMapper.xml

@@ -0,0 +1,142 @@
+<?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.community.huiju.dao.TpActivitySignInMapper">
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpActivitySignIn">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="community_id" jdbcType="INTEGER" property="communityId" />
+    <result column="activity_id" jdbcType="INTEGER" property="activityId" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    <result column="user_role" jdbcType="VARCHAR" property="userRole" />
+    <result column="building_info" jdbcType="VARCHAR" property="buildingInfo" />
+    <result column="ta_user_id" jdbcType="INTEGER" property="taUserId" />
+    <result column="user_tel" jdbcType="VARCHAR" property="userTel" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, community_id, activity_id, user_name, user_role, building_info, ta_user_id, user_tel, 
+    create_date
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tp_activity_sign_in
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tp_activity_sign_in
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpActivitySignIn">
+    insert into tp_activity_sign_in (id, community_id, activity_id, 
+      user_name, user_role, building_info, 
+      ta_user_id, user_tel, create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityId,jdbcType=INTEGER}, 
+      #{userName,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}, #{buildingInfo,jdbcType=VARCHAR}, 
+      #{taUserId,jdbcType=INTEGER}, #{userTel,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivitySignIn">
+    insert into tp_activity_sign_in
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="communityId != null">
+        community_id,
+      </if>
+      <if test="activityId != null">
+        activity_id,
+      </if>
+      <if test="userName != null">
+        user_name,
+      </if>
+      <if test="userRole != null">
+        user_role,
+      </if>
+      <if test="buildingInfo != null">
+        building_info,
+      </if>
+      <if test="taUserId != null">
+        ta_user_id,
+      </if>
+      <if test="userTel != null">
+        user_tel,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null">
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null">
+        #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null">
+        #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingInfo != null">
+        #{buildingInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null">
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="userTel != null">
+        #{userTel,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivitySignIn">
+    update tp_activity_sign_in
+    <set>
+      <if test="communityId != null">
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null">
+        activity_id = #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null">
+        user_role = #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingInfo != null">
+        building_info = #{buildingInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null">
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="userTel != null">
+        user_tel = #{userTel,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpActivitySignIn">
+    update tp_activity_sign_in
+    set community_id = #{communityId,jdbcType=INTEGER},
+      activity_id = #{activityId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_role = #{userRole,jdbcType=VARCHAR},
+      building_info = #{buildingInfo,jdbcType=VARCHAR},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      user_tel = #{userTel,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>