From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java | 228 ++++++++++++++++++++++++++++++++++++-
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java | 2
ycl-smoke/src/main/resources/application-pro.yml | 9 +
ycl-smoke/src/main/resources/application-dev.yml | 9 +
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java | 42 +++++-
ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml | 2
ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml | 10
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java | 29 +++-
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java | 7
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java | 3
10 files changed, 304 insertions(+), 37 deletions(-)
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
index 5b4542e..a6fac5a 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
+++ b/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 {
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java
index 5d4c4a5..cb7ed2a 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsAlarmRecord.java
+++ b/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;
/**
* 鐩戞祴鐐笽D
*/
@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;
/**
* 澶勭悊浜篒D
*/
@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;
}
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 f01fe90..88a8f88 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
@@ -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;
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 a67ea69..827ce29 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
@@ -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;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java
index 466e75a..75842d5 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java
+++ b/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;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
index be83a71..b0f0276 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
+++ b/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 {
@@ -45,11 +87,10 @@
AlarmMsgResponseDto dto = responseDto.getData();
List<OdsAlarmMsg> list = dto.getContent();
System.out.println(list.size());
- list.forEach(o->{
+ 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 {
@@ -75,11 +115,10 @@
AlarmMsgResponseDto dto = responseDto.getData();
List<OdsAlarmMsg> list = dto.getContent();
System.out.println(list.size());
- list.forEach(o->{
+ 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);
diff --git a/ycl-smoke/src/main/resources/application-dev.yml b/ycl-smoke/src/main/resources/application-dev.yml
index 397270e..63c7aea 100644
--- a/ycl-smoke/src/main/resources/application-dev.yml
+++ b/ycl-smoke/src/main/resources/application-dev.yml
@@ -70,4 +70,11 @@
port: 8281
userName: suichang
passWord: a12345677
- ip: 10.10.10.10
\ No newline at end of file
+ ip: 10.10.10.10
+
+aliyun:
+ oss:
+ endpoint: https://oss-cn-chengdu.aliyuncs.com
+ keyId: LTAI5tJTmV5pnPKjwvpdjyfi
+ keySecret: HRXGIrDdnhdlvV5AoOB4k9NxYP0G9Z
+ bucketName: baizonghao-upload
\ No newline at end of file
diff --git a/ycl-smoke/src/main/resources/application-pro.yml b/ycl-smoke/src/main/resources/application-pro.yml
index e55b72c..8c0ee05 100644
--- a/ycl-smoke/src/main/resources/application-pro.yml
+++ b/ycl-smoke/src/main/resources/application-pro.yml
@@ -69,4 +69,11 @@
port: 8281
userName: suichang
passWord: a12345677
- ip: 10.10.10.10
\ No newline at end of file
+ ip: 10.10.10.10
+
+aliyun:
+ oss:
+ endpoint: https://oss-cn-chengdu.aliyuncs.com
+ keyId: LTAI5tJTmV5pnPKjwvpdjyfi
+ keySecret: HRXGIrDdnhdlvV5AoOB4k9NxYP0G9Z
+ bucketName: baizonghao-upload
\ No newline at end of file
diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml
index 07b650e..fd920a0 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml
+++ b/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>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
index 274b904..c4fa9d6 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
+++ b/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>
--
Gitblit v1.8.0