Merge remote-tracking branch 'origin/import' into import

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -1186,15 +1186,15 @@ public class JieLinkServiceImpl implements IJieLinkService {
                     messageInstance.setTitle("访客进入通知");
                     mes = "已进入行政办公楼";
                 }
+                if ("1".equals(deviceInfo.getDeviceType())) {
                     for (Integer id : visitId) {
                         VisitInfoMation inf = visitInfomationRepository.selectById(id);
                         //查询当天是否已经发送过消息，每天只发一次
-                    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-                    QueryWrapper<MessageInstance> wrapper = new QueryWrapper();
-                    wrapper.eq("push_time", sf.format(new Date()));
-                    wrapper.eq("recipient_id", inf.getUserId());
-                    wrapper.eq("title", messageInstance.getTitle());
-                    List<MessageInstance> list = messageInstanceRepository.selectList(wrapper);
+                        MessageInstance instance = new MessageInstance();
+                        instance.setRecipientId(BigInteger.valueOf(inf.getUserId()));
+                        instance.setTitle(messageInstance.getTitle());
+                        instance.setPushTime(new Date());
+                        List<MessageInstance> list = messageInstanceRepository.queryMessageInstances(instance);
                         if (list.isEmpty()) {
                             messageInstance.setContent("您邀请的访客" + sysUserData.getName() + mes +
                                     " <a href=\"/pages/init/init?flag=2&id=" + id + "\" style=\"color: #3497CE;\">点击查看</a>");
@@ -1222,6 +1222,7 @@ public class JieLinkServiceImpl implements IJieLinkService {
                 }
             }
         }
+    }
 
     @Override
     public void syncDeviceInfo() {

src/main/resources/application-jie-conf.yml

@@ -137,7 +137,7 @@ syncSchedule:
   config: false
 
 message:
-  config: false
+  config: true
 
 dahua:
   videoStatus: false
\ No newline at end of file

src/main/resources/application-prod-conf.yml

@@ -137,7 +137,7 @@ syncSchedule:
   config: true
 
 message:
-  config: false
+  config: true
 
 dahua:
   videoStatus: false
\ No newline at end of file

src/main/resources/mapper/DoorRecordMapper.xml

@@ -247,6 +247,7 @@
         where dr.del_flag = '0'
         and dr.tenement_type = '0'
         and dr.record_type = '1'
+        and dr.source = '1'
         <if test="attendance.beginTime !=null and attendance.endTime != null ">
             and dr.cross_time between #{attendance.beginTime} and #{attendance.endTime}
         </if>

src/main/resources/mapper/MessageInstanceMapper.xml

@@ -31,6 +31,12 @@
         <if test="entity.flag !=null and entity.flag != '' ">
             and read_flag = #{entity.flag}
         </if>
+        <if test="entity.title !=null">
+            and title = #{entity.title}
+        </if>
+        <if test="entity.pushTime !=null">
+            and DATE_FORMAT(push_time,'%y%m%d') = DATE_FORMAT( #{entity.pushTime},'%y%m%d')
+        </if>
     </select>
 
     <select id="queryMessageInstancesPaged" resultMap="BaseResultMap">