From eef671368e1b2e26c1f7f5dc12241b95e378e5c9 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 02 三月 2023 15:07:05 +0800
Subject: [PATCH] 油烟
---
document/副本丽水市遂昌县智慧执法应用-资源开通表 -0228.xlsx | 0
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 5 ++---
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java | 23 +++++++++++++++++++++++
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java | 2 ++
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx" "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
new file mode 100644
index 0000000..1b07cbb
--- /dev/null
+++ "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
Binary files differ
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
index d64ef8c..f01fe90 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,126 +29,147 @@
* id
*/
@TableId("id")
+ @JsonProperty("Id")
private String id;
/**
* 鐖惰妭鐐�
*/
@TableField("pid")
+ @JsonProperty("Pid")
private String pid;
/**
* 钀ヤ笟鎵х収缂栧彿
*/
@TableField("bl_no")
+ @JsonProperty("BlNo")
private String blNo;
/**
* 钀ヤ笟鎵х収鍚嶇О
*/
@TableField("bl_name")
+ @JsonProperty("BlName")
private String blName;
/**
* 缁勭粐鍚嶇О
*/
@TableField("org")
+ @JsonProperty("Org")
private String org;
/**
* 鍚嶇О
*/
@TableField("name")
+ @JsonProperty("Name")
private String name;
/**
* 鑱旂郴浜�
*/
@TableField("contact")
+ @JsonProperty("Contact")
private String contact;
/**
* 鎵嬫満鍙�
*/
@TableField("mobile")
+ @JsonProperty("Mobile")
private String mobile;
/**
* 鑱旂郴鐢佃瘽
*/
@TableField("telephone")
+ @JsonProperty("Telephone")
private String telephone;
/**
* 绫诲瀷锛�1:绯荤粺鐢ㄦ埛2:缁忛攢鍗曚綅3:琛屾斂鍗曚綅4:椁愰ギ鍗曚綅锛�
*/
@TableField("typ")
+ @JsonProperty("Typ")
private Integer typ;
/**
* 鍒涘缓鑰�
*/
@TableField("creator")
+ @JsonProperty("Creator")
private String creator;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_at")
+ @JsonProperty("CreateAt")
private Long createAt;
/**
* 鐘舵��
*/
@TableField("status")
+ @JsonProperty("Status")
private Integer status;
/**
* 鍦板潃
*/
@TableField("address")
+ @JsonProperty("Address")
private String address;
/**
* 鏍囧織
*/
@TableField("logo")
+ @JsonProperty("Logo")
private String logo;
/**
* 钀ヤ笟鏃堕棿
*/
@TableField("business_hour")
+ @JsonProperty("BusinessHour")
private String businessHour;
/**
* 杩愮淮浜哄憳ID
*/
@TableField("maintainer_id")
+ @JsonProperty("MaintainerId")
private String maintainerId;
/**
* 鍏宠仈鍦板潃
*/
@TableField("area_ids")
+ @JsonProperty("AreaIds")
private String areaIds;
/**
* 鍦板潃搴忓垪
*/
@TableField("area_id_cascads")
+ @JsonProperty("AreaIdCascades")
private String areaIdCascads;
/**
* 鍦板潃璇︾粏淇℃伅
*/
@TableField("areas")
+ @JsonProperty("Areas")
private String areas;
/**
* 浠嬬粛
*/
@TableField("desc")
+ @JsonProperty("Desc")
private String desc;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
index e885681..51f8ca3 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
@@ -425,6 +425,8 @@
@JsonProperty("Cause")
private String cause;
+ @TableField("customer")
+ private String customerString;
@JsonProperty("Customer")
private OdsLocaleCustomer customer;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
index 4d093a8..99ea1a1 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
@@ -1,6 +1,5 @@
package com.ycl.smoke.remote.service;
-import com.ycl.smoke.entity.OdsDetectorDaily;
import com.ycl.smoke.entity.OdsTenMinData;
import com.ycl.smoke.remote.dto.*;
import org.springframework.cloud.openfeign.FeignClient;
@@ -35,11 +34,11 @@
@RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listLocale")
- SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody DetectorDailyParamDto paramDto,
+ SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
@RequestHeader("Auth") String token);
@PostMapping(value = "/admin/queryCustomer")
- SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody DetectorDailyParamDto paramDto,
+ SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
@RequestHeader("Auth") String token);
--
Gitblit v1.8.0