suntianwu 3 年 前
コミット
92b2984156

+ 1 - 1
src/main/java/com/iden/common/mapper/IdenPersonMapper.java

@@ -13,5 +13,5 @@ import java.util.List;
  * @since 2021-12-22 17:23:47
  */
 public interface IdenPersonMapper extends BaseMapper<IdenPerson> {
-    List<String> getFeatPtrList();
+
 }

+ 1 - 1
src/main/java/com/iden/common/service/IdenPersonService.java

@@ -12,5 +12,5 @@ import java.util.List;
  * @since 2021-12-22 17:23:47
  */
 public interface IdenPersonService extends IService<IdenPerson> {
-   List<String> getFeatPtrList();
+
 }

+ 2 - 4
src/main/java/com/iden/common/service/impl/IdenPersonServiceImpl.java

@@ -6,7 +6,7 @@ import com.iden.common.entity.IdenPerson;
 import com.iden.common.service.IdenPersonService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+
 
 /**
  * 人员表(IdenPerson)表服务实现类
@@ -16,7 +16,5 @@ import java.util.List;
  */
 @Service
 public class IdenPersonServiceImpl extends ServiceImpl<IdenPersonMapper, IdenPerson> implements IdenPersonService {
-    public List<String> getFeatPtrList(){
-        return this.baseMapper.getFeatPtrList();
-    }
+
 }

+ 23 - 23
src/main/resources/mybatis/IdenFaceImageMapper.xml

@@ -5,18 +5,18 @@
     <select id="queryHomPageTotal" resultType="com.iden.common.vo.HomPageStaVO">
         SELECT
         (
-          select count(1) from iden_face_image where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
+          select count(1) from iden_face_image where data_date = DATE_FORMAT(now(),'%Y%m%d')
         ) todayFaceImageTotal,
         (
-          select count(1) from iden_face_image  where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') and type='0'
+          select count(1) from iden_face_image  where data_date = DATE_FORMAT(now(),'%Y%m%d') and type='0'
         )  todaStrangerFaceImageTotal,
         (
-          select count(1) from iden_face_image  where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') and type like '%1%'
+          select count(1) from iden_face_image  where data_date = DATE_FORMAT(now(),'%Y%m%d') and type like '%1%'
         )  todayKeynoteFaceImageTotal,
         (
           select  IFNULL(count(1),0)
 					from iden_warning_event a
-					where  DATE_FORMAT(a.data_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
+					where  DATE_FORMAT(a.data_time,'%Y%m%d') = DATE_FORMAT(now(),'%Y%m%d')
         )  warningEventTotal,
         (
           select count(1) from iden_camera
@@ -31,31 +31,31 @@
     </select>
 
     <select id="listLastWeekFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
-        select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
-        from iden_warning_sta
-        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
-        and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
-        group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        select if((dayofweek(data_date) -1) = 0,7,(dayofweek(data_date) -1)) weekDay, count(1) faceImageTotal
+        from iden_face_image
+        where  data_date >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y%m%d')
+        and data_date &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y%m%d')
+        group by data_date
         order by weekDay
     </select>
 
     <select id="listLastWeekStrangerFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
-         select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
-        from iden_warning_sta
-        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
-        and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+         select if((dayofweek(data_date) -1) = 0,7,(dayofweek(data_date) -1)) weekDay, count(1) faceImageTotal
+        from iden_face_image
+        where  data_date >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y%m%d')
+        and data_date &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y%m%d')
         and type like '%0%'
-         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+         group by data_date
         order by weekDay
     </select>
 
     <select id="listLastWeekKeynoteFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
-        select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
-        from iden_warning_sta
-        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
-        and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+        select if((dayofweek(data_date) -1) = 0,7,(dayofweek(data_date) -1)) weekDay, count(1) faceImageTotal
+        from iden_face_image
+        where  data_date >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y%m%d')
+        and data_date &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y%m%d')
          and type like '%1%'
-         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+         group by data_date
         order by weekDay
     </select>
 
@@ -63,11 +63,11 @@
 
     <select id="listLastWeekEventComingFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
         select if((dayofweek(create_time) -1) = 0,7,(dayofweek(create_time) -1)) weekDay, count(1) faceImageTotal
-        from iden_warning_sta
-        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
-        and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+        from iden_face_image
+        where  data_date >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y%m%d')
+        and data_date &lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y%m%d')
         and type like '%3%'
-         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+         group by data_date
         order by weekDay
     </select>
 </mapper>

+ 0 - 4
src/main/resources/mybatis/IdenPersonMapper.xml

@@ -2,8 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iden.common.mapper.IdenPersonMapper">
 
-    <select id="getFeatPtrList" resultType="java.lang.String">
-        select feat_ptr from iden_person
-    </select>
-
 </mapper>

+ 2 - 2
src/main/resources/mybatis/IdenWarningStaMapper.xml

@@ -4,7 +4,7 @@
     <select id="queryWarningPersonRateSta" resultType="com.iden.common.vo.HomePageWarningStaVO">
         select type,
         sum(total) total,
-        convert(sum(total)/(select sum(total) from iden_warning_event),decimal(20,2)) rate
+        convert(sum(total)/(select sum(total) from iden_warning_sta),decimal(20,2)) rate
         from iden_warning_sta  group by type
     </select>
 
@@ -19,7 +19,7 @@
         max(t.subdistrict) subdistrict,
         count(1) total
         from iden_warning_person t
-        where t.data_date = DATE_SUB(curdate(),INTERVAL -1 DAY)
+        where t.data_date = DATE_FORMAT(DATE_SUB(curdate(),INTERVAL 1 DAY),'%Y%m%d')
         group by t.data_date,t.community_id,t.type
          on duplicate key update
         community_code=values(community_code),