zhanghua
2023-03-04 af3601ec9b19f037ddfe1ca2966be5d71203d965
油烟设备接口
10个文件已修改
331 ■■■■■ 已修改文件
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java 224 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/resources/application-dev.yml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/resources/application-pro.yml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
@@ -4,11 +4,12 @@
import com.ycl.smoke.entity.OdsInTime;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
public class DataIntimeResponseDto {
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java
@@ -3,9 +3,14 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
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;
@@ -25,115 +30,138 @@
    private static final long serialVersionUID = 1L;
    @TableId("id")
    @JsonProperty("Id")
    private String id;
    /**
     * 监测点ID
     */
    @TableField("local_id")
    @JsonProperty("LocaleId")
    private String localId;
    /**
     * 设备编号
     */
    @TableField("mn")
    @JsonProperty("MN")
    private String mn;
    /**
     * 数据类型1:超标2:异常
     */
    @TableField("typ")
    @JsonProperty("Typ")
    private Integer typ;
    /**
     * 报警时间
     */
    @TableField("alarm_date")
    private LocalDateTime alarmDate;
    @JsonProperty("AlarmDate")
    private String alarmDate;
    /**
     * 设备类型
     */
    @TableField("device_type")
    @JsonProperty("DeviceType")
    private Integer deviceType;
    /**
     * 采集时间
     */
    @TableField("acquit_at")
    @JsonProperty("AcquitAt")
    private Long acquitAt;
    /**
     * 处理时间
     */
    @TableField("process_at")
    @JsonProperty("ProcessAt")
    private Long processAt;
    /**
     * 所属单位
     */
    @TableField("owner")
    @JsonProperty("Owner")
    private String owner;
    /**
     * 解决方案
     */
    @TableField("solution")
    @JsonProperty("Solution")
    private String solution;
    /**
     * 处理地址
     */
    @TableField("processing_address")
    @JsonProperty("ProcessingAddress")
    private String processingAddress;
    /**
     * 点位地址
     */
    @TableField("addr")
    @JsonProperty("Addr")
    private String addr;
    /**
     * 处理人ID
     */
    @TableField("process_user_id")
    @JsonProperty("ProcessUserId")
    private String processUserId;
    /**
     * 处理人名称
     */
    @TableField("process_user_name")
    @JsonProperty("ProcessUserName")
    private String processUserName;
    /**
     * 处理原因
     */
    @TableField("process_reason")
    @JsonProperty("Processor")
    private String processReason;
    /**
     * 关联地址
     */
    @TableField("created_at")
    private LocalDateTime createdAt;
    @JsonProperty("CreatedAt")
    private String createdAt;
    /**
     * 地址序列
     */
    @TableField("update_at")
    private LocalDateTime updateAt;
    @JsonProperty("UpdatedAt")
    private String updateAt;
    /**
     * 查询结果总数
     */
    @TableField("total")
    @JsonProperty("")
    private Integer total;
    /**
     *  报警图片
     */
    @TableField(exist = false)
    @JsonProperty("AlarmRecordPicS")
    private String[] alarmRecordPics;
    /**
     * 报警图片
     */
    @TableField("alarm_record_pics")
    private String alarmRecordPics;
    private String alarmRecordPicsString;
}
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
@@ -30,7 +30,7 @@
     */
    @TableId("id")
    @JsonProperty("Id")
    private String id;
    private Long id;
    /**
     * 父节点
@@ -148,27 +148,42 @@
     * 关联地址
     */
    @TableField("area_ids")
    @JsonProperty("AreaIds")
    private String areaIds;
    private String areaIdsString;
    /**
     * 地址序列
     */
    @TableField("area_id_cascads")
    @JsonProperty("AreaIdCascades")
    private String areaIdCascads;
    private String areaIdCascadsString;
    /**
     * 地址详细信息
     */
    @TableField("areas")
    private String areasString;
    @TableField(exist = false)
    @JsonProperty("AreaIds")
    private String[] areaIds;
    /**
     * 地址序列
     */
    @TableField(exist = false)
    @JsonProperty("AreaIdCascades")
    private String[] areaIdCascads;
    /**
     * 地址详细信息
     */
    @TableField(exist = false)
    @JsonProperty("Areas")
    private String areas;
    private String[] areas;
    /**
     * 介绍
     */
    @TableField("desc")
    @TableField("desc1")
    @JsonProperty("Desc")
    private String desc;
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
@@ -200,7 +200,7 @@
     */
    @TableField("create_at")
    @JsonProperty("CreateAt")
    private Long createAt;
    private String createAt;
    /**
     * 状态[1:一般监测点,2:特殊监测点,99:废弃监测点]
@@ -360,14 +360,14 @@
     */
    @TableField("created_at")
    @JsonProperty("CreatedAt")
    private LocalDateTime createdAt;
    private String createdAt;
    /**
     * 更新时间
     */
    @TableField("updated_at")
    @JsonProperty("UpdatedAt")
    private LocalDateTime updatedAt;
    private String updatedAt;
    @TableField("health_code_value11")
    @JsonProperty("HealthCodeValue11")
@@ -430,5 +430,6 @@
    private String customerString;
    @JsonProperty("Customer")
    @TableField(exist = false)
    private OdsLocaleCustomer customer;
}
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java
@@ -28,7 +28,7 @@
    private String telephone;
    @JsonProperty("Typ")
    private int typ;
    @JsonProperty("CreateAt")
    @JsonProperty("Creator")
    private String creator;
    @JsonProperty("CreateAt")
    private long createAt;
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
@@ -1,10 +1,11 @@
package com.ycl.smoke.task;
import com.alibaba.fastjson.JSON;
import com.ycl.service.redis.RedisService;
import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.*;
import com.ycl.smoke.dto.*;
import com.ycl.smoke.remote.service.ISmokeDetectionService;
import com.ycl.smoke.service.IOdsAlarmMsgService;
import com.ycl.smoke.service.*;
import com.ycl.utils.redis.RedisKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -20,6 +21,18 @@
    IOdsAlarmMsgService alarmMsgService;
    IOdsTenMinDataService tenMinDataService;
    IOdsInTimeService inTimeService;
    IOdsLocaleService localeService;
    IOdsCustomerService customerService;
    IOdsAlarmRecordService alarmRecordService;
    IOdsCurAlarmService curAlarmService;
    @Resource
    private RedisService redisService;
@@ -33,8 +46,37 @@
        this.alarmMsgService = alarmMsgService;
    }
    @Autowired
    public void setTenMinDataService(IOdsTenMinDataService tenMinDataService) {
        this.tenMinDataService = tenMinDataService;
    }
    @Autowired
    public void setInTimeService(IOdsInTimeService inTimeService) {
        this.inTimeService = inTimeService;
    }
    @Autowired
    public void setLocaleService(IOdsLocaleService localeService) {
        this.localeService = localeService;
    }
    @Autowired
    public void setCustomerService(IOdsCustomerService customerService) {
        this.customerService = customerService;
    }
    @Autowired
    public void setAlarmRecordService(IOdsAlarmRecordService alarmRecordService) {
        this.alarmRecordService = alarmRecordService;
    }
    @Autowired
    public void setCurAlarmService(IOdsCurAlarmService curAlarmService) {
        this.curAlarmService = curAlarmService;
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
    // @Scheduled(cron = "0 */2 * * * ?")   // 每一个分钟执行 0 0/1 * ?
    // @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void alarmMsgTask() {
        try {
@@ -48,8 +90,7 @@
                list.forEach(o->{
                    try {
                        alarmMsgService.save(o);
                    }
                    catch (Exception ex){
                    } catch (Exception ex) {
                    }
                });
@@ -64,7 +105,6 @@
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
    // @Scheduled(cron = "0 */2 * * * ?")   // 每一个分钟执行 0 0/1 * ?
    // @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void queryDataDetectorDaily2Task() {
        try {
@@ -78,8 +118,7 @@
                list.forEach(o->{
                    try {
                        alarmMsgService.save(o);
                    }
                    catch (Exception ex){
                    } catch (Exception ex) {
                    }
                });
@@ -93,6 +132,175 @@
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void queryTenMinData() {
        try {
            TenMinParamDto paramDto = TenMinParamDto.builder().build();
            SmokeResultResponseDto<List<OdsTenMinData>> responseDto = smokeDetectionService.queryTenMinData(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                List<OdsTenMinData> list = responseDto.getData();
                list.forEach(o -> {
                    try {
                        tenMinDataService.save(o);
                    } catch (Exception ex) {
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void listDataIntime() {
        try {
            DataIntimeParamDto paramDto = DataIntimeParamDto.builder().build();
            SmokeResultResponseDto<DataIntimeResponseDto> responseDto = smokeDetectionService.listDataIntime(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                DataIntimeResponseDto dataIntimeResponseDto = responseDto.getData();
                List<OdsInTime> list = dataIntimeResponseDto.getContent();
                list.forEach(o -> {
                    try {
                        inTimeService.save(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
            System.out.printf(ex.getMessage());
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void listLocale() {
        try {
            LocaleParamDto paramDto = LocaleParamDto.builder().build();
            SmokeResultResponseDto<LocaleResponseDto> responseDto = smokeDetectionService.listLocale(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                LocaleResponseDto responseDataDto = responseDto.getData();
                List<OdsLocale> list = responseDataDto.getContent();
                list.forEach(o -> {
                    try {
                        o.setCustomerString(JSON.toJSONString(o.getCustomer()));
                        localeService.save(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
            System.out.printf(ex.getMessage());
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void queryCustomer() {
        try {
            CustomerParamDto paramDto = CustomerParamDto.builder().build();
            SmokeResultResponseDto<CustomerResponseDto> responseDto = smokeDetectionService.queryCustomer(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                CustomerResponseDto responseDataDto = responseDto.getData();
                List<OdsCustomer> list = responseDataDto.getContent();
                list.forEach(o -> {
                    try {
                        o.setAreasString(o.getAreas() == null ? "" : JSON.toJSONString(o.getAreas()));
                        o.setAreaIdsString(o.getAreaIds() == null ? "" : JSON.toJSONString(o.getAreaIds()));
                        o.setAreaIdCascadsString(o.getAreaIdCascads() == null ? "" : JSON.toJSONString(o.getAreaIdCascads()));
                        customerService.save(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
            System.out.printf(ex.getMessage());
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void listAlarmRecord() {
        try {
            AlarmMsgParamDto paramDto = AlarmMsgParamDto.builder().build();
            SmokeResultResponseDto<AlarmRecordResponseDto> responseDto = smokeDetectionService.getListAlarmRecord(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                AlarmRecordResponseDto responseDataDto = responseDto.getData();
                List<OdsAlarmRecord> list = responseDataDto.getContent();
                list.forEach(o -> {
                    try {
                        o.setAlarmRecordPicsString(JSON.toJSONString(o.getAlarmRecordPics()));
                        alarmRecordService.save(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
            System.out.printf(ex.getMessage());
        }
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
//    @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
    public void listCurAlarm() {
        try {
            CurAlarmParamDto paramDto = CurAlarmParamDto.builder().Typ(2).build();
            SmokeResultResponseDto<CurAlarmResponseDto> responseDto = smokeDetectionService.getListCurAlarm(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
            if (responseDto.getStatus() == 200) {
                CurAlarmResponseDto responseDataDto = responseDto.getData();
                List<OdsCurAlarm> list = responseDataDto.getContent();
                list.forEach(o -> {
                    try {
                        curAlarmService.save(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
                });
                // alarmMsgService.saveBatch(list);
            } else if (responseDto.getStatus() == 114) {
                login();
                queryDataDetectorDaily2Task();
            }
        } catch (Exception ex) {
            System.out.printf(ex.getMessage());
        }
    }
    void login() {
        LoginParamDto loginParamDto = LoginParamDto.builder().username("connect_test2").password("test@234").noCode(true).build();
        SmokeResultResponseDto<LoginResponseDto> responseDto = smokeDetectionService.loginAction(loginParamDto);
ycl-smoke/src/main/resources/application-dev.yml
@@ -71,3 +71,10 @@
  userName: suichang
  passWord: a12345677
  ip: 10.10.10.10
aliyun:
  oss:
    endpoint: https://oss-cn-chengdu.aliyuncs.com
    keyId: LTAI5tJTmV5pnPKjwvpdjyfi
    keySecret: HRXGIrDdnhdlvV5AoOB4k9NxYP0G9Z
    bucketName: baizonghao-upload
ycl-smoke/src/main/resources/application-pro.yml
@@ -70,3 +70,10 @@
  userName: suichang
  passWord: a12345677
  ip: 10.10.10.10
aliyun:
  oss:
    endpoint: https://oss-cn-chengdu.aliyuncs.com
    keyId: LTAI5tJTmV5pnPKjwvpdjyfi
    keySecret: HRXGIrDdnhdlvV5AoOB4k9NxYP0G9Z
    bucketName: baizonghao-upload
ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml
@@ -22,7 +22,7 @@
        <result column="created_at" property="createdAt" />
        <result column="update_at" property="updateAt" />
        <result column="total" property="total" />
        <result column="alarm_record_pics" property="alarmRecordPics" />
        <result column="alarm_record_pics" property="alarmRecordPicsString" />
    </resultMap>
    <!-- 通用查询结果列 -->
ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
@@ -21,15 +21,15 @@
        <result column="logo" property="logo" />
        <result column="business_hour" property="businessHour" />
        <result column="maintainer_id" property="maintainerId" />
        <result column="area_ids" property="areaIds" />
        <result column="area_id_cascads" property="areaIdCascads" />
        <result column="areas" property="areas" />
        <result column="desc" property="desc" />
        <result column="area_ids" property="areaIdsString" />
        <result column="area_id_cascads" property="areaIdCascadsString" />
        <result column="areas" property="areasString" />
        <result column="desc1" property="desc" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, pid, bl_no, bl_name, org, name, contact, mobile, telephone, typ, creator, create_at, status, address, logo, business_hour, maintainer_id, area_ids, area_id_cascads, areas, desc
        id, pid, bl_no, bl_name, org, name, contact, mobile, telephone, typ, creator, create_at, status, address, logo, business_hour, maintainer_id, area_ids, area_id_cascads, areas, desc1
    </sql>
</mapper>