合并

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpActivitySignIn;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TpActivitySignInMapper {
@@ -17,4 +18,10 @@ public interface TpActivitySignInMapper {
     int updateByPrimaryKeySelective(TpActivitySignIn record);
 
     int updateByPrimaryKey(TpActivitySignIn record);
+
+    /**
+     * 查询当前人员是否已签到
+     *
+     */
+    TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
 }

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

@@ -49,15 +49,16 @@ public class TpActivity {
     private String signStatus;
     /**
      * 签到状态
+     * 0已签到，1未签到
      */
-    private  String signType;
+    private  Integer signType;
 
-    public String getSignType() {
-        return signType;
+    public void setSignType(Integer signType) {
+        this.signType = signType;
     }
 
-    public void setSignType(String signType) {
-        this.signType = signType;
+    public Integer getSignType() {
+        return signType;
     }
 
     private List<String> imgList;

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

@@ -197,15 +197,16 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-        TpActivitySignIn tpActivitySignIn= tpActivitySignInMapper.selectByPrimaryKey(userId);
-        if (null!=tpActivitySignIn) {
-//            tpActivitySignIn.signType()
-        }
+
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,communityId);
         TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
         if (null != tpUser) {
             tpActivity.setUserName(tpUser.getUserName());
         }
+        //查看当前人是否签到
+        TpActivitySignIn tpActivitySignIn= tpActivitySignInMapper.selectSing(activityId,userId);
+        Integer signType=tpActivitySignIn==null?0:1;
+        tpActivity.setSignType(signType);
 
         //返回报名状态
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);

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

@@ -41,6 +41,9 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
     /**
      * 期
      */
@@ -246,7 +249,40 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
                 // 插入楼栋信息数据
                 insertTpBuildingOwnerInfo(userElement, user, null);
             }
-
+            //审核通过后推送消息（临时数据）
+            String[] messageArr= new String[14];
+            messageArr[0]="账号已审核通过，看看下面的消息了解下APP如何使用吧！";
+            messageArr[1]="点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
+            messageArr[2]="点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";
+            messageArr[3]="点击上方 访客邀请，将生成的二维码发送给访客，访客即可使用二维码开门";
+            messageArr[4]="点击上方 公区监控，查看小区公共区域视频直播，看看大家都在干什么";
+            messageArr[5]="点击上方 智能家居，安装APP玩转室内智能家居设备";
+            messageArr[6]="想知道物业公告和社区活动？点击底部 论坛 查看";
+            messageArr[7]="参与社区议事，发布二手/求购/租赁等热门话题，点击底部 论坛 话题";
+            messageArr[8]="点击底部开锁图标，获取开门二维码，即可扫码开门";
+            messageArr[9]="楼道灯不亮，电梯坏了，通下水道，找保洁？点击底部 服务 报修";
+            messageArr[10]="想投诉施工扰民、乱搭乱建、乱停车？点击底部 服务 投诉";
+            messageArr[11]="有很急的事需要马上联系物业？点击底部 服务 物业 电话联系物业";
+            messageArr[12]="家人想刷脸进门不会操作？点击底部 个人 房屋成员管理 邀请新成员为TA录入人脸";
+            messageArr[13]="物业费水电费不想跑去物业交？点击底部 个人 物业相关缴费 一键缴费";
+            for (String count:messageArr) {
+                TpMessage message = new TpMessage();
+                message.setCommunityId(userVerify.getCommunityId());
+                message.setMessageType("6");
+                message.setAdviceType("1");
+                message.setModelType("1");
+                message.setUuid(userElement.getId());
+                message.setUuidType("1");
+                message.setSource("1");
+                message.setMessageContent(count);
+                message.setStatus("1");
+                message.setResult("");
+                message.setMeaasgeTypeId("");
+                message.setReadStatus("0");
+                message.setCreateUser(userElement.getId());
+                message.setCreateDate(new Date());
+                tpMessageMapper.insert(message);
+            }
             responseBean.addSuccess("操作成功！");
             return responseBean;
         }

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

@@ -139,4 +139,14 @@
       create_date = #{createDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectSing" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tp_activity_sign_in
+    where
+    activity_id = #{activityId,jdbcType=INTEGER}
+    and ta_user_id = #{userID,jdbcType=INTEGER}
+  </select>
+
 </mapper>