油烟对外接口

zhanghua

2023-03-03 1ded71f8fe1b7ac7746e6ea6e09b7db4a4000340

油烟对外接口

 ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java

New file
@@ -0,0 +1,73 @@
package com.ycl.smoke.controller.smoke;

import com.ycl.service.redis.RedisService;
import com.ycl.smoke.dto.*;
import com.ycl.smoke.entity.OdsTenMinData;
import com.ycl.smoke.remote.service.ISmokeDetectionService;
import com.ycl.utils.redis.RedisKey;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@Api(tags = "驾驶舱数据接口-AI物联")
@RestController
@RequestMapping("/api/smoke")
public class SmokeController {
    ISmokeDetectionService smokeDetectionService;

    @Autowired
    public void setSmokeDetectionService(ISmokeDetectionService smokeDetectionService) {
        this.smokeDetectionService = smokeDetectionService;
    }

    @Resource
    private RedisService redisService;

    @PostMapping(value = "/listAlarmMsg")
    public SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {

        return smokeDetectionService.getListAlarmMsg(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/queryDataDetectorDaily2")
    public SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {

        return smokeDetectionService.queryDataDetectorDaily2(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/queryTenMinData")
    public SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto params) {
        return smokeDetectionService.queryTenMinData(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/listDataIntime")
    public SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto params) {
        return smokeDetectionService.listDataIntime(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/listLocale")
    public SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto params) {
        return smokeDetectionService.listLocale(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/queryCustomer")
    public SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto params) {
        return smokeDetectionService.queryCustomer(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }


    @PostMapping(value = "/listAlarmRecord")
    public SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
        return smokeDetectionService.getListAlarmRecord(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

    @PostMapping(value = "/listCurAlarm")
    public SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto params) {
        return smokeDetectionService.getListCurAlarm(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
    }

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgDataVo.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgDataVo.java
@@ -1,4 +1,4 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDateDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDateDto.java
@@ -1,31 +1,39 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class AlarmMsgParamDateDto {

    /**
     * 查询创建报警日期
     */
    @JsonProperty("CreatedAt")
    private String CreatedAt;
    /**
     * ExceedStandard超标,AbnormalOffline 异常离线
     */
    @JsonProperty("msg_type")
    private String msg_type;
    /**
     * 起始时间戳
     */
    @JsonProperty("Begin")
    private Long Begin;
    /**
     * 结束时间戳
     */
    @JsonProperty("End")
    private Long End;
    /**
     * 设备编码
     */
    @JsonProperty("mn")
    private String mn;

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDto.java
@@ -1,27 +1,34 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class AlarmMsgParamDto {
    /**
     * 起始位置 - 必填
     */
    @JsonProperty("StartAt")
    private Integer StartAt;
    /**
     * 请求数量 - 必填
     */
    @JsonProperty("Size")
    private Integer Size;
    /**
     * 1：超标2：异常 - 必填
     */
    @JsonProperty("Typ")
    private Integer Typ;

    /**
     * 查询创建报警日期
     */
    @JsonProperty("Param")
    private AlarmMsgParamDateDto Param;
}


 ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
@@ -1,4 +1,4 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java

copy from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
copy to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java
File was copied from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
@@ -1,7 +1,7 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsAlarmRecord;
import lombok.Data;
import lombok.NoArgsConstructor;

@@ -9,10 +9,10 @@

@Data
@NoArgsConstructor
public class AlarmMsgResponseDto {
public class AlarmRecordResponseDto {

    @JsonProperty("content")
    private List<OdsAlarmMsg> content;
    private List<OdsAlarmRecord> content;

    @JsonProperty("total")
    private Integer total;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamChildDto.java

New file
@@ -0,0 +1,43 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class CurAlarmParamChildDto {
    /**
     * 是    是否需要最高浓度日期
     */
    @JsonProperty("WithCEmissionsMaxDate")
    public Boolean WithCEmissionsMaxDate;
    /**
     * 是    查询起始时间
     */
    @JsonProperty("StartAt")
    public Long StartAt;
    /**
     * 是    查询结束时间
     */
    @JsonProperty("EndAt")
    public Long EndAt;
    /**
     * 否    健康码颜色
     */
    @JsonProperty("HealthCodeColor")
    public String HealthCodeColor;
    /**
     * 否    设备编码
     */
    @JsonProperty("mn")
    public String mn;
    /**
     * 25    否    所属单位
     */
    @JsonProperty("Owner")
    public String Owner;

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamDto.java

New file
@@ -0,0 +1,46 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class CurAlarmParamDto {
    /**
     * 起始位置 - 必填
     */
    @JsonProperty("StartAt")
    private Integer StartAt;
    /**
     * 请求数量 - 必填
     */
    @JsonProperty("Size")
    private Integer Size;
    /**
     * 1：超标2：异常 - 必填
     */
    @JsonProperty("Typ")
    private Integer Typ;

    /**
     * 排序依据 - 否
     */
    @JsonProperty("SortBy")
    private String  SortBy;
    /**
     * 升序、降序
     */
    @JsonProperty("SortMode")
    private String SortMode;
    /**
     *
     */
    @JsonProperty("Param")
    private CurAlarmParamChildDto Param;
}




 ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java

copy from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
copy to ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java
File was copied from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
@@ -1,7 +1,7 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsCurAlarm;
import lombok.Data;
import lombok.NoArgsConstructor;

@@ -9,10 +9,10 @@

@Data
@NoArgsConstructor
public class AlarmMsgResponseDto {
public class CurAlarmResponseDto {

    @JsonProperty("content")
    private List<OdsAlarmMsg> content;
    private List<OdsCurAlarm> content;

    @JsonProperty("total")
    private Integer total;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerParamDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerParamDto.java
@@ -1,43 +1,53 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import cn.hutool.core.lang.Pid;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class CustomerParamDto {
    /**
     * 必填    起始位置
     */
    @JsonProperty("page")
    private Integer page;
    /**
     * 是    请求数量
     */
    @JsonProperty("perpage")
    private Integer perpage;
    /**
     * 是    1:系统用户2:经销单位3:行政单位4:餐饮单位
     */
    @JsonProperty("Typ")
    private Integer Typ;
    /**
     * 否    单位名称
     */
    @JsonProperty("Org")
    private String Org;
    /**
     * 否    负责人
     */
    @JsonProperty("Name")
    private String Name;
    /**
     * 否    联系电话
     */
    @JsonProperty("Mobile")
    private String Mobile;
    /**
     * 否    上级单位
     */
    @JsonProperty("Pid")
    private String Pid;
    /**
     * 否    区域
     */
    @JsonProperty("AreaId")
    private String AreaId;

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerResponseDto.java
@@ -1,8 +1,7 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsCustomer;
import com.ycl.smoke.entity.OdsDetectorDaily;
import lombok.Data;
import lombok.NoArgsConstructor;


 ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamChildDto.java

New file
@@ -0,0 +1,27 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class DataIntimeParamChildDto {
    /**
     * 否    筛选组织（Param内）
     */
    @JsonProperty("Owner")
    private String Owner;
    /**
     * 筛选状态（Param内）
     */
    @JsonProperty("Status")
    private String Status;
    /**
     * 监测点审核状态（Param内）
     */
    @JsonProperty("StatusOfRecord")
    private String StatusOfRecord;
}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java
@@ -1,36 +1,44 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class DataIntimeParamDto {
    /**
     * 否    起始位置
     */
    @JsonProperty("StartAt")
    private Integer StartAt;

    /**
     * 是    请求数量
     */
    @JsonProperty("Size")
    private Integer Size;
    /**
     * 是    1:监控设备2:监测设备
     */
    @JsonProperty("Typ")
    private Integer Typ;
    /**
     * 否    排序依据
     */
    @JsonProperty("SortBy")
    private String SortBy;
    /**
     * 是    升序/降序
     */
    @JsonProperty("SortMode")
    private String SortMode;
    /**
     * 否
     */
    @JsonProperty("Param")
    private DataIntimeParamChildDto Param;



 ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java
@@ -1,7 +1,6 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsInTime;
import lombok.Builder;
import lombok.Data;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyParamDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyParamDto.java
@@ -1,35 +1,43 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.baomidou.mybatisplus.annotation.OrderBy;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class DetectorDailyParamDto {
    /**
     * 状态[1:正常,2:超标,3:正常离线,4异常离]
     */
    @JsonProperty("Status")
    private Integer Status;
    /**
     * 数据获取日期
     */
    @JsonProperty("AcquitDate")
    private String AcquitDate;
    /**
     * 排序字段
     */
    @JsonProperty("OrderBy")
    private String OrderBy;
    /**
     * 页序号
     */
    @JsonProperty("Page")
    private Integer Page;
    /**
     * 每页记录数
     */
    @JsonProperty("Perpage")
    private Integer Perpage;
    /**
     * 检查是否安装有设备
     */
    @JsonProperty("LocaleWithDevice")
    private Boolean LocaleWithDevice;

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyResponseDto.java
@@ -1,7 +1,6 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsDetectorDaily;
import lombok.Data;
import lombok.NoArgsConstructor;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamDto.java

New file
@@ -0,0 +1,32 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class LocaleParamDto {
    /**
     * 起始位置 - 必填
     */
    @JsonProperty("StartAt")
    private Integer StartAt;
    /**
     * 请求数量 - 必填
     */
    @JsonProperty("Size")
    private Integer Size;


    /**
     *
     */
    @JsonProperty("Param")
    private LocaleParamOwnerDto Param;
}




 ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamOwnerDto.java

New file
@@ -0,0 +1,19 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class LocaleParamOwnerDto {
    @JsonProperty("id")
    private String id;
    @JsonProperty("owner")
    private String owner;
}




 ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleResponseDto.java
@@ -1,7 +1,6 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsDetectorDaily;
import com.ycl.smoke.entity.OdsLocale;
import lombok.Data;
import lombok.NoArgsConstructor;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginParamDto.java

New file
@@ -0,0 +1,30 @@
package com.ycl.smoke.dto;


import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class LoginParamDto {

    /**
     * 账号 - 必填
     */
    @JsonProperty("username")
    private String username;
    /**
     * 密码 - 必填
     */
    @JsonProperty("password")
    private String password;
    /**
     * 选择true则无需验证码
     */
    @JsonProperty("noCode")
    private Boolean noCode;

}

 ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginResponseDto.java
@@ -1,4 +1,4 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/ResultsPageInfo.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/ResultsPageInfo.java
@@ -1,4 +1,4 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import lombok.Data;


 ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java

File was renamed from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/SmokeResultResponseDto.java
@@ -1,4 +1,4 @@
package com.ycl.smoke.remote.dto;
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

 ycl-smoke/src/main/java/com/ycl/smoke/dto/TenMinParamDto.java

New file
@@ -0,0 +1,28 @@
package com.ycl.smoke.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@Builder
@EqualsAndHashCode(callSuper = false)
public class TenMinParamDto {
    /**
     * 设备的编号
     */
    @JsonProperty("mn")
    private String mn;
    /**
     * 数据获取起始日期（2021-11-01）
     */
    @JsonProperty("AcquitAtTimeBegin")
    private String AcquitAtTimeBegin;
    /**
     * 数据获取截止日期
     */
    @JsonProperty("AcquitAtTimeEnd")
    private String AcquitAtTimeEnd;

}

 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java

@@ -7,6 +7,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -26,210 +28,243 @@
    private static final long serialVersionUID = 1L;

    @TableId("id")
    @JsonProperty("")
    private Integer id;

    /**
     * 异常离线天数
     */
    @TableField("abnormal_off_line_days")
    @JsonProperty("AbnormalOfflineDays")
    private Integer abnormalOffLineDays;

    /**
     * 处理率
     */
    @TableField("abnormal_off_line_process_ratio")
    @JsonProperty("AbnormalOfflineProcessRatio")
    private Integer abnormalOffLineProcessRatio;

    /**
     * 异常离线待处理天数
     */
    @TableField("abnormal_off_line_to_process_days")
    @JsonProperty("AbnormalOfflineToProcessDays")
    private Integer abnormalOffLineToProcessDays;

    /**
     * 地址
     */
    @TableField("addr")
    @JsonProperty("Addr")
    private String addr;

    /**
     * 排放物浓度折算(昨日)
     */
    @TableField("c_emissions")
    @JsonProperty("CEmissions")
    private BigDecimal cEmissions;

    /**
     * 在线日平均排放浓度
     */
    @TableField("c_emissions_avg_online")
    @JsonProperty("CEmissionsAvgOnline")
    private BigDecimal cEmissionsAvgOnline;

    /**
     * 日最高排放浓度
     */
    @TableField("c_emissions_max")
    @JsonProperty("CEmissionsMax")
    private BigDecimal cEmissionsMax;

    /**
     * 日最高排放浓度日期
     */
    @TableField("c_emissions_max_date")
    @JsonProperty("CEmissionsMaxDate")
    private LocalDateTime cEmissionsMaxDate;

    /**
     * 颗粒物浓度折算(昨日)
     */
    @TableField("c_granule")
    @JsonProperty("CGranule")
    private BigDecimal cGranule;

    /**
     * 非甲烷总烃浓度折算    (昨日)
     */
    @TableField("c_hydrocarbon")
    @JsonProperty("CHydrocarbon")
    private BigDecimal cHydrocarbon;

    /**
     * 菜系名
     */
    @TableField("cuisine_name")
    @JsonProperty("CuisineName")
    private String cuisineName;

    /**
     * 营业执照
     */
    @TableField("customer_bl_no")
    @JsonProperty("CustomerBlNo")
    private String customerBlNo;

    /**
     * 联系人
     */
    @TableField("customer_contact")
    @JsonProperty("CustomerContact")
    private String customerContact;

    /**
     * 电话
     */
    @TableField("customer_mobile")
    @JsonProperty("CustomerMobile")
    private String customerMobile;

    /**
     * 店名称
     */
    @TableField("customer_name")
    @JsonProperty("CustomerName")
    private String customerName;

    /**
     * 监测仪故障天数
     */
    @TableField("detector_failure_days")
    @JsonProperty("DetectorFailureDays")
    private Integer detectorFailureDays;

    /**
     * 超标阈值
     */
    @TableField("emissions_sill")
    @JsonProperty("EmissionsSill")
    private Double emissionsSill;

    /**
     * 超标数
     */
    @TableField("excess_num")
    @JsonProperty("ExcessNum")
    private Integer excessNum;

    /**
     * 超标待处理天数
     */
    @TableField("excess_to_process_days")
    @JsonProperty("ExcessToProcessDays")
    private Integer excessToProcessDays;

    /**
     * 净化器不正常使用天数
     */
    @TableField("filter_abnormally_used_days")
    @JsonProperty("FilterAbnormallyUsedDays")
    private Integer filterAbnormallyUsedDays;

    /**
     * 净化器清洗次数
     */
    @TableField("filter_wash_times")
    @JsonProperty("FilterWashTimes")
    private Integer filterWashTimes;

    /**
     * 颗粒物超标阈值
     */
    @TableField("granuli_sill")
    private Double granuliSill;

    /**
     * 健康码颜色
     */
    @TableField("health_code_color")
    @JsonProperty("HealthCodeColor")
    private String healthCodeColor;

    /**
     * 非甲烷总烃超标阈值
     */
    @TableField("hydrocarbon_sill")
    @JsonProperty("HydrocarbonSill")
    private Double hydrocarbonSill;

    /**
     * 非甲烷总烃超标阈值
     */
    @TableField("granule_sill")
    @JsonProperty("GranuleSill")
    private Double granuleSill;
    /**
     * 监测点Id
     */
    @TableField("locale_id")
    @JsonProperty("LocaleId")
    private String localeId;

    /**
     * 纬度
     */
    @TableField("local_lat")
    @JsonProperty("LocaleLat")
    private String localLat;

    /**
     * 经度
     */
    @TableField("local_lng")
    @JsonProperty("LocaleLng")
    private String localLng;

    /**
     * 设备的mn数据
     */
    @TableField("mn")
    @JsonProperty("MN")
    private String mn;

    /**
     * 名称
     */
    @TableField("name")
    @JsonProperty("Name")
    private String name;

    /**
     * 店家原因导致离线天数
     */
    @TableField("off_line_cause_by_shop_days")
    @JsonProperty("OfflineCausedByShopDays")
    private Integer offLineCauseByShopDays;

    /**
     * 所属单位
     */
    @TableField("owner")
    @JsonProperty("Owner")
    private String owner;

    /**
     * 歇业天数
     */
    @TableField("shop_close_days")
    @JsonProperty("ShopClosedDays")
    private Integer shopCloseDays;

    /**
     * 状态[1:一般监测点,2:特殊监测点,99:废弃监测点]
     */
    @TableField("status")
    @JsonProperty("Status")
    private Integer status;

    /**
     * 状态描述
     */
    @TableField("status_desc")
    @JsonProperty("StatusDesc")
    private String statusDesc;



 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

 ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java

File was deleted

 ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamDto.java

File was deleted

 ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamOwnerDto.java

File was deleted

 ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginParamDto.java

File was deleted

 ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/TenMinParamDto.java

File was deleted

 ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java

@@ -1,7 +1,7 @@
package com.ycl.smoke.remote.service;

import com.ycl.smoke.entity.OdsTenMinData;
import com.ycl.smoke.remote.dto.*;
import com.ycl.smoke.dto.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -32,25 +32,25 @@
    @PostMapping(value = "/admin/listDataIntime")
    SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
                                                                             @RequestHeader("Auth") String token);
//
//    @PostMapping(value = "/admin/listLocale")
//    SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
//                                                                             @RequestHeader("Auth") String token);
//
//    @PostMapping(value = "/admin/queryCustomer")
//    SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
//                                                                             @RequestHeader("Auth") String token);
//

   @PostMapping(value = "/admin/listLocale")
   SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
                                                                            @RequestHeader("Auth") String token);

   @PostMapping(value = "/admin/queryCustomer")
   SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
                                                                            @RequestHeader("Auth") String token);



    @PostMapping(value = "/admin/listAlarmRecord")
    SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
    SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
                                                                @RequestHeader("Auth") String token);



    @PostMapping(value = "/admin/listCurAlarm")
    SmokeResultResponseDto<AlarmMsgResponseDto> getListCurAlarm(@RequestBody AlarmMsgParamDto paramDto,
    SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto paramDto,
                                                                @RequestHeader("Auth") String token);

}

 ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java

@@ -2,15 +2,13 @@

import com.ycl.service.redis.RedisService;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.remote.dto.*;
import com.ycl.smoke.dto.*;
import com.ycl.smoke.remote.service.ISmokeDetectionService;
import com.ycl.smoke.service.IOdsAlarmMsgService;
import com.ycl.utils.redis.RedisKey;
import org.apache.velocity.runtime.directive.Foreach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.List;

 ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml

@@ -9,7 +9,6 @@
        <result column="owner" property="owner" />
        <result column="cuisine" property="cuisine" />
        <result column="customer_id" property="customerId" />
        <result column="customer" property="customer" />
        <result column="fan_speed" property="fanSpeed" />
        <result column="fan_quantity" property="fanQuantity" />
        <result column="pipe_area" property="pipeArea" />
@@ -47,12 +46,12 @@
        <result column="health_code_value3" property="healthCodeValue3" />
        <result column="health_code_value4" property="healthCodeValue4" />
        <result column="health_code_value5" property="healthCodeValue5" />
        <result column="health_code_valuee6" property="healthCodeValuee6" />
        <result column="health_code_value6" property="healthCodeValue6" />
        <result column="abnormal_value7" property="abnormalValue7" />
        <result column="abnormal_value78" property="abnormalValue78" />
        <result column="abnormal_value79" property="abnormalValue79" />
        <result column="abnormal_value710" property="abnormalValue710" />
        <result column="aliIot_device_name" property="aliiotDeviceName" />
        <result column="abnormal_value78" property="abnormalValue8" />
        <result column="abnormal_value79" property="abnormalValue9" />
        <result column="abnormal_value710" property="abnormalValue10" />
        <result column="ali_iot_device_name" property="aliIotDeviceName" />
        <result column="aliIot" property="aliIot" />
        <result column="created_at" property="createdAt" />
        <result column="updated_at" property="updatedAt" />
@@ -60,7 +59,7 @@
        <result column="health_code_value12" property="healthCodeValue12" />
        <result column="send_mode" property="sendMode" />
        <result column="surpass_calc_method" property="surpassCalcMethod" />
        <result column="fan_standardurrent" property="fanStandardurrent" />
        <result column="fan_standard_current" property="fanStandardCurrent" />
        <result column="filter_standard_current" property="filterStandardCurrent" />
        <result column="status_of_record" property="statusOfRecord" />
        <result column="remark_of_record" property="remarkOfRecord" />