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

yaowanxin

3 天以前 dfacb4e315a49f2c0399574ef094c87b96e7e248

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

# Conflicts:
#	cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java

 cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java

@@ -266,6 +266,7 @@
            AtomicInteger numberOfDataEntries = new AtomicInteger();
            List<Object> list = new ArrayList<>();
            for (int config = 0; config < v.size(); config++) {
//                String refery = v.get(config).getRefery();
                String refery = getRefer(v.get(config).getRefery());
                for (int i = 0; i < dataList.size(); i++) {
                    JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());

 inspect-server/pom.xml

@@ -59,8 +59,8 @@
            <groupId>com.aspose</groupId>
            <artifactId>aspose-words</artifactId>
            <version>15.12.0</version>
            <scope>system</scope>
            <systemPath>D:/aspose-words-15.12.0-jdk16.jar</systemPath>
<!--            <scope>system</scope>-->
<!--            <systemPath>D:/aspose-words-15.12.0-jdk16.jar</systemPath>-->
        </dependency>
        <dependency>
            <groupId>com.itextpdf</groupId>

 inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml

@@ -4,18 +4,41 @@

    <!-- 查看预警列表 -->
    <select id="selectDeviationWarningPage" resultType="com.ruoyi.inspect.dto.InsProductDeviationWarningDto">
        select *
        from (select ipdw.*,
        isa.sample                                              sample_name,
        isa.model                                               sample_model,
        concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name
        from ins_product_deviation_warning ipdw
        left join ins_sample isa on isa.id = ipdw.ins_sample_id
        left join ins_product ip On ip.id = ipdw.ins_product_id) a
<!--        select *-->
<!--        from (select ipdw.*,-->
<!--        isa.sample                                              sample_name,-->
<!--        isa.model                                               sample_model,-->
<!--        concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name-->
<!--        from ins_product_deviation_warning ipdw-->
<!--        left join ins_sample isa on isa.id = ipdw.ins_sample_id-->
<!--        left join ins_product ip On ip.id = ipdw.ins_product_id) a-->
<!--        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">-->
<!--            ${ew.customSqlSegment}-->
<!--        </if>-->
<!--        order by ipdw.detection_time desc-->
        SELECT
        a.*,
        sto.object_type
        FROM (
        SELECT
        ipdw.*,
        sip.sample AS sss,
        isa.sample AS sample_name,
        isa.model AS sample_model,
        CONCAT(ip.inspection_item, ip.inspection_item_subclass) AS inspection_item_name
        FROM ins_product_deviation_warning ipdw
        LEFT JOIN ins_sample isa ON isa.id = ipdw.ins_sample_id
        LEFT JOIN ins_product ip ON ip.id = ipdw.ins_product_id
        LEFT JOIN structure_item_parameter sip ON sip.id = ip.structure_item_parameter_id
        ) a
        LEFT JOIN structure_test_object sto
        ON a.sss LIKE CONCAT('%"', sto.specimen_name, '"%')  -- 模糊匹配
        WHERE
        sto.object_type != 3  -- 过滤条件：排除 object_type 为 3 的记录
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
            AND ${ew.customSqlSegment}
        </if>
        order by ipdw.detection_time desc
        ORDER BY a.detection_time DESC
    </select>

</mapper>