whycxzp
2021-04-02 a316931773816df64433796c98aced21f8b72097
更新 设备资源申请接口
2个文件已修改
14 ■■■■ 已修改文件
src/main/java/com/whyc/config/StaticResourceConfig.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DeviceMaintainMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/config/StaticResourceConfig.java
@@ -17,11 +17,17 @@
        //这个是可行的,解析的时候path为*.html,校验路径admin下是否存在
        registry.addResourceHandler("/map/*").addResourceLocations("classpath:/META-INF/resources/map/");
        registry.addResourceHandler("/testConclusion.pdf").addResourceLocations("classpath:/META-INF/resources/");
        registry.addResourceHandler("/index.html").addResourceLocations("classpath:/META-INF/resources/");
        registry.addResourceHandler("/css/**").addResourceLocations("classpath:/META-INF/resources/css/");
        registry.addResourceHandler("/js/**").addResourceLocations("classpath:/META-INF/resources/js/");
        registry.addResourceHandler("/img/**").addResourceLocations("classpath:/META-INF/resources/img/");
        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/META-INF/resources/fonts/");
        //doc.html静态
        registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
        registry.addResourceHandler("/service-worker.js").addResourceLocations("classpath:/META-INF/resources/");
        super.addResourceHandlers(registry);
        //registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
        //registry.addResourceHandler("*.html").addResourceLocations("classpath:/META-INF/resources/");
src/main/resources/mapper/DeviceMaintainMapper.xml
@@ -108,13 +108,7 @@
                INNER JOIN db_experiment.tb_device_type t ON m1.device_type_id = t.device_type_id
                )
            LEFT JOIN
            (
            SELECT
            *
            FROM
            ( SELECT device_id, actual_time FROM db_experiment.tb_device_maintain WHERE is_plan = 0 ORDER BY device_id, actual_time DESC ) t
            GROUP BY
            t.device_id
            ( SELECT device_id, actual_time FROM db_experiment.tb_device_maintain WHERE is_plan = 0 ORDER BY device_id, actual_time DESC limit 1
            ) temp ON temp.device_id = m1.device_id
        WHERE
            m2.is_plan = 1