提交

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

@@ -47,6 +47,19 @@ public class TpActivity {
      * 报名状态
      */
     private String signStatus;
+    /**
+     * 签到状态
+     * 0已签到，1未签到
+     */
+    private  Integer signType;
+
+    public void setSignType(Integer 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

@@ -203,6 +203,10 @@ public class SocialServiceImpl implements SocialServiceI {
         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>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -80,7 +80,7 @@ public class ActivityController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id活动编号;activityTitle活动标题;" +
                     "activityCarouselImg轮播图;activityContent活动详情;contentImg活动内容配图;signUpMax活动人数上限;" +
-                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿，radio:1是需要二维码，2是不需要")
+                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿，signInCode:1是需要二维码，2是不需要")
     })
     @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
     public ResponseBean updateActivity(@RequestBody String parameter, HttpSession session) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.MessageMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaUserVerifyMapper;
 import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.Message;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.model.User;
@@ -18,6 +20,8 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -67,9 +71,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
         userVerify.setVerifyStatus(status);
         userVerify.setVerifyName(user.getUserName());
-
-        taUserVerifyMapper.updateById(userVerify);
         responseBean.addSuccess("操作成功！");
+
         return responseBean;
     }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -236,21 +236,18 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 // 扫码签到
 
                 if (radio==1){
-                    try {
-                       InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(),tpActivity.getId()+"");
-                        String codeUrl= imageServiceI.getImageUrl(inputStream);
+
+//                       InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(),tpActivity.getId()+"");
+//                        String codeUrl= imageServiceI.getImageUrl(inputStream);
+
                         TdImages tdImages= new TdImages();
-                        tdImages.setImageUrl(codeUrl);
+                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
                         tdImages.setCreateUser(userElement.getId());
                         tdImages.setCreateTime(LocalDateTime.now());
                         tdImagesMapper.insert(tdImages);
-                    } catch (WriterException e) {
-                        e.printStackTrace();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
+
 
                 }
 
@@ -344,21 +341,16 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
          tdImagesMapper.delete(queryWrapper);
 
         if (radio==1){
-            try {
-                InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(), tpActivity.getId()+"");
-                String codeUrl= imageServiceI.getImageUrl(inputStream);
+
+//                InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(), tpActivity.getId()+"");
+//                String codeUrl= imageServiceI.getImageUrl(inputStream);
                 TdImages tdImages= new TdImages();
-                tdImages.setImageUrl(codeUrl);
+                tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                 tdImages.setUuid(tpActivity.getId());
                 tdImages.setType(Constant.ACTIVITY);
                 tdImages.setCreateUser(userElement.getId());
                 tdImages.setCreateTime(LocalDateTime.now());
                 tdImagesMapper.insert(tdImages);
-            } catch (WriterException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
 
         }
 

VUECODE/smart-property-manage/package.json

@@ -23,6 +23,7 @@
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "qrcode": "^1.3.3",
     "qs": "^6.6.0",
     "vue": "2.5.17",
     "vue-amap": "^0.5.8",

VUECODE/smart-property-manage/src/api/activity.js

@@ -39,7 +39,7 @@ export function updateActivity(data) {
     url: '/activity/update',
     method: 'put',
     data: {
-      radio: data.radio,
+      signInCode: data.signInCode,
       id: data.id,
       activityTitle: data.activityTitle,
       activityCarouselImg: data.activityCarouselImg, // 轮播图

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -50,6 +50,13 @@
             placeholder="选择日期"/>
         </div>
       </el-form-item>
+      <el-form-item>
+      <div style="display: flex;">
+          <span style="width: 200px;transform:translateY(-1%);">是否需要报名人扫码签到</span>
+          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
+      </div>
+      </el-form-item>
       <el-form-item prop="sort">
         <div style="display: flex; justify-content: flex-start;">
           <span style="width: 120px;">权重值</span>
@@ -70,6 +77,7 @@ export default {
   data() {
     return {
       ruleForm: {
+        signInCode: '',
         id: '',
         activityTitle: '',
         activityCarouselImg: '', // 轮播图
@@ -78,7 +86,8 @@ export default {
         signUpMax: '', //  活动人数上限
         registrationEndTime: '', // 报名活动结束时间
         sort: 1, // 权重
-        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+        status: '', // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+        radio: ''
       },
       activityContentList: [], // 活动配图预览列表
       imageUrl: '', // 轮播图预览

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -6,24 +6,20 @@
       {{ ruleForm.activityContent }}
     </div>
     <div class="activityContextImg">
-      <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" >
+      <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" />
     </div>
+    <span v-if="ruleForm.signInCode=='1'">
     <div style="display: flex;">
           <span style="width: 200px;transform:translateY(25%);">是否需要报名人扫码签到</span>
-          <el-radio v-model="ruleForm.radio" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
-          <el-radio v-model="ruleForm.radio" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
-          <el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button> 
+          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
+          <span style="padding-left:20%"><el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button></span> 
     </div>
-      <div style="padding-left:30%;">
-        <div><img :src="ruleForm.activityCode" width="200" height="200" ></div>
-        
-        <a :href="ruleForm.activityCode" download="图片">
-　　    <img :src="ruleForm.activityCode" alt="图片">
-        </a>
-
-        <!-- <a download="图片" :href="ruleForm.activityCode + 'admin/miniProgram.jpg'">点击下载</a>
-        <div><el-button type="primary" style="float:left;" @click=" downloadCodeImg()">查看签到名单</el-button> </div> -->
-      </div>
+    <div style="padding-left:30%;">
+        <div><img :src="qrcode" width="200" height="200" ></div>
+        <a :href="qrcode" download="qrcode.jpg"  style="color:#00BFFF;padding-left:15%">点击下载</a>
+    </div>
+    </span>
     <div class="progress">
       <div class="text-progress">
         <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
@@ -32,7 +28,7 @@
       </div>
       <div class="circular"/>
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
-      <a type="primary" style="float: left;" @click="lockSignUp">查看报名名单</a>
+      <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
     </div>
     <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
     <div class="bom-button">
@@ -42,6 +38,8 @@
 </template>
 
 <script>
+import html2canvas from 'html2canvas';
+import QRCode from 'qrcode'
 
 export default {
   name: 'Index',
@@ -61,8 +59,11 @@ export default {
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
       },
+      codeIMG: '',
+      ownerDocument: '',
       isEdi: true, // 显示修改按钮
-      innerW: 0 // 进度条
+      innerW: 0, // 进度条
+      qrcode: '',
     }
   },
   mounted() {
@@ -76,12 +77,10 @@ export default {
         this.ruleForm = resData.info
         this.codeIMG =resData.info.activityCode
         this.ruleForm.contentImg = resData.contentImg
-        if (this.ruleForm.signUpMax !== 0) {
-          const tempNum = 450 / this.ruleForm.signUpMax
-          this.innerW = this.ruleForm.signUpCount * tempNum
-          console.log(this.$refs.innerDiv.style.width)
-          console.log(this.innerW)
-        }
+
+        QRCode.toDataURL(this.codeIMG, (err, url)=> {
+          this.qrcode = url
+        })
         if (this.ruleForm.status === '0') {
           this.isEdi = false
         }
@@ -121,8 +120,40 @@ export default {
   alink.href = this.ruleForm.activityCode;
   alink.download = "pic"; //图片名
   alink.click();
-  }
-  
+  },
+
+   dataURLToBlob(dataurl) {//ie 图片转格式
+          var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
+            bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+          while (n--) {
+            u8arr[n] = bstr.charCodeAt(n);
+          }
+          return new Blob([u8arr], {type: mime})
+        },
+        
+        downloadResult() {
+          html2canvas(document.getElementById('mymap')).then(canvas => {
+				this.imgmap = canvas.toDataURL()
+				console.log(999, this.imgmap)
+				if (window.navigator.msSaveOrOpenBlob) {
+					var bstr = atob(this.imgmap.split(',')[1])
+					var n = bstr.length
+					var u8arr = new Uint8Array(n)
+					while (n--) {
+						u8arr[n] = bstr.charCodeAt(n)
+					}
+					var blob = new Blob([u8arr])
+					window.navigator.msSaveOrOpenBlob(blob, 'chart-download' + '.' + 'png')
+				} else {
+					// 这里就按照chrome等新版浏览器来处理
+					const a = document.createElement('a')
+					a.href = this.imgmap
+					a.setAttribute('download', 'chart-download')
+					a.click()
+				}
+ 
+			});
+        }
 }
   }
 </script>