Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-06 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b

Merge remote-tracking branch 'origin/master'

 ycl-common/src/main/java/constant/CheckSnapCountConstants.java

@@ -3,13 +3,23 @@

public class CheckSnapCountConstants {
    /**
     * 2022年同期抓拍量(省厅)
     * 2022年同期车辆抓拍量(省厅)
     */
    public final static String City = "check.snapCount.city";
    public final static String Car_City = "check.snapCount.car.city";
    /**
     * 2022年同期抓拍量(区县)
     * 2022年同期车辆抓拍量(区县)
     */
    public final static String County = "check.snapCount.county";
    public final static String Car_County = "check.snapCount.car.county";

    /**
     * 2022年同期人脸抓拍量(省厅)
     */
    public final static String Face_City = "check.snapCount.face.city";
    /**
     * 2022年同期人脸抓拍量(区县)
     */
    public final static String Face_County = "check.snapCount.face.city";


    /**
     * 2022抓拍数计算倍率

 ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java

@@ -79,8 +79,8 @@
        }

        //获取2022同期抓拍平均值 省厅、市局
        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);

        // 查询是否index表已经存在今日数据
        List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());

 ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java

@@ -80,8 +80,8 @@
        }

        //获取2022同期抓拍平均值 省厅、市局
        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City);
        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County);

        // 查询今日数据
        List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java

@@ -215,7 +215,7 @@
            job.setJobGroup("CHECK");
            jobService.deleteJob(job);
        }
        return checkTemplateMapper.updateCheckTemplate(new CheckTemplate().setId(id));
        return checkTemplateMapper.deleteCheckTemplateById(id);
    }

    @Override

 ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckTemplateMapper">
    

    <resultMap type="com.ycl.platform.domain.entity.CheckTemplate" id="CheckTemplateResult">
        <result property="id"    column="id"    />
        <result property="templateName"    column="template_name"    />
@@ -42,12 +42,12 @@
        </where>
        order by examine_tag DESC, examine_category , create_time
    </select>
    

    <select id="selectCheckTemplateById" resultMap="CheckTemplateResult">
        <include refid="selectCheckTemplateVo"/>
        where id = #{id}
    </select>
        

    <insert id="insertCheckTemplate" useGeneratedKeys="true" keyProperty="id">
        insert into t_check_template
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -117,9 +117,9 @@
        where id = #{id}
    </update>

    <delete id="deleteCheckTemplateById" parameterType="Long">
        delete from t_check_template where id = #{id}
    </delete>
    <update id="deleteCheckTemplateById">
        update t_check_template set deleted = 1 where id = #{id}
    </update>

    <delete id="deleteCheckTemplateByIds" parameterType="String">
        delete from t_check_template where id in
@@ -129,4 +129,4 @@
    </delete>


</mapper>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml

@@ -337,12 +337,11 @@
        t_monitor m
        LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
        LEFT JOIN t_yw_unit u ON p.unit_id = u.id
        LEFT JOIN t_work_order w ON p.id = w.point_id
        LEFT JOIN t_work_order w ON w.serial_number = p.serial_number
        WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
        <if test="dateRange != null and dateRange.size > 0">
            AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
        </if>
        GROUP BY months
        ORDER BY months
    </select>