zmc
2023-11-23 555fb0758022cec5c88e98ee989d0287bdc0052d
修改历史数据查询的sql语句
已修改3个文件
24 ■■■■■ 文件已修改
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/FugitiveDustMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
@@ -100,7 +100,8 @@
        PageBean pageBean =  fugitiveDustService.getExceptionData2(page,pageSize,siteName,exceptionType,beginTime,endTime,street,dutyCompany);
        return Result.success(pageBean);
    }
//根据某段时间内某个异常类型查询对应的店铺名称和设备编号
    //根据某段时间内某个异常类型,地址,运维商,点位名称  ,查询对应的店铺名称和设备编号
@GetMapping("/sitenamecode")
public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName){
    List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
@@ -108,13 +109,15 @@
}
    //   根据时间返回该异常类型的个数
    //   根据时间,地址,运维商,点位名称,返回该异常类型的个数
    @GetMapping("/exceptionnum")
    public Result exceptionNum(String exceptionType,String beginTime,String endTime,String [] street,String [] dutyCompany,String siteName){
        Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime,street,dutyCompany,siteName);
        return Result.success(list);
    }
//    查询历史数据 不分页
@GetMapping("/history")
public Result conditonQueryHistoryData(String siteName,String beginTime, String endTime ){
src/main/resources/application.yml
@@ -3,9 +3,9 @@
    ds1:
      driver-class-name: com.mysql.cj.jdbc.Driver
#      生产环境
      url: jdbc:mysql://localhost:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
      username: fume
      password: fume_feiyu2023
#      url: jdbc:mysql://localhost:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
#      username: fume
#      password: fume_feiyu2023
#      url: jdbc:mysql://localhost:3306/qianduan_sql?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
#      username: root
@@ -15,9 +15,9 @@
#      username: root
#      password: 123456
#      url: jdbc:mysql://114.215.109.124:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
#      username: fumeRemote
#      password: feiyu2023
      url: jdbc:mysql://114.215.109.124:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
      username: fumeRemote
      password: feiyu2023
mybatis:
  configuration:
src/main/resources/mapper/FugitiveDustMapper.xml
@@ -35,7 +35,8 @@
        from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
        <where>
            <if test="siteName !=null and siteName != ''">
                b.name like concat('%',#{siteName},'%')
<!--                b.name like concat('%',#{siteName},'%')-->
                b.name = #{siteName}
            </if>
            <if test="mnCode !=null and mnCode != ''">
                and a.mn_code = #{mnCode}
@@ -107,7 +108,7 @@
                d.lst between #{beginTime} and #{endTime} and d.type = 'day'
            </if>
        </where>
        order by c.name asc
        order by d.day_avg desc
    </select>