diff --git a/db/module.sql b/db/module.sql
index f638cd07e974e0426b6b5649e32176c6cceb7e72..41b69bde9beea70236fd6952b1568c041ce1e202 100644
--- a/db/module.sql
+++ b/db/module.sql
@@ -16,12 +16,17 @@ CREATE TABLE mortals_xhx_realtime_dataflow(
`queueNum` varchar(255) NOT NULL COMMENT '鎺掗槦缂栫爜',
`location` varchar(255) NOT NULL COMMENT '鍔炵悊浣嶇疆',
`picture` varchar(255) COMMENT '璇嗗埆鎴浘',
+ `picUri` varchar(255) COMMENT '鐩稿鍥剧墖pic',
+ `serverIndexCode` varchar(255) COMMENT '鍥剧墖璧勬簮鍞竴鏍囪瘑',
+ `eventId` varchar(255) COMMENT '浜嬩欢id',
+ `eventType` bigint(20) NOT NULL COMMENT '浜嬩欢绫诲瀷',
`createTime` datetime COMMENT '鍒涘缓鏃堕棿',
`createUserId` bigint(20) COMMENT '鍒涘缓浜篿d',
`updateTime` datetime COMMENT '鏇存柊鏃堕棿',
`updateUserId` bigint(20) COMMENT '鏇存柊浜篿d',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='浜哄憳鍙戠幇璁板綍';
+
-- ----------------------------
-- 棰勭害绛惧埌璁板綍琛�
-- ----------------------------
diff --git "a/doc/\347\262\276\347\273\206\345\214\226\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\347\262\276\347\273\206\345\214\226\347\256\241\347\220\206\347\263\273\347\273\237.docx"
index 7076aadf47d7e9aec4962607419f7c663387defb..2c91b76dd6dcab06a2686630cb36e3826d665f3a 100644
Binary files "a/doc/\347\262\276\347\273\206\345\214\226\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\347\262\276\347\273\206\345\214\226\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ
diff --git a/refined-manager/src/main/java/com/mortals/xhx/common/code/HikAbilityEnum.java b/refined-manager/src/main/java/com/mortals/xhx/common/code/HikAbilityEnum.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f4e03e0f4f7426c2e892429cc15bb6694c8f839
--- /dev/null
+++ b/refined-manager/src/main/java/com/mortals/xhx/common/code/HikAbilityEnum.java
@@ -0,0 +1,64 @@
+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 娴峰悍浜嬩欢绫诲瀷
+*
+* @author zxfei
+*/
+public enum HikAbilityEnum {
+ 浜鸿劯璇嗗埆浜嬩欢("event_face_recognition", "浜鸿劯璇嗗埆浜嬩欢");
+ private String value;
+ private String desc;
+
+ HikAbilityEnum(String value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public String getDesc() {
+ return this.desc;
+ }
+
+ public static HikAbilityEnum getByValue(String value) {
+ for (HikAbilityEnum recognitionPlanTypeEnum : HikAbilityEnum.values()) {
+ if (recognitionPlanTypeEnum.getValue() == value) {
+ return recognitionPlanTypeEnum;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇Map闆嗗悎
+ *
+ * @param eItem 涓嶅寘鍚」
+ * @return
+ */
+ public static Map<String, String> getEnumMap(String... eItem) {
+ Map<String, String> resultMap = new LinkedHashMap<>();
+ for (HikAbilityEnum item : HikAbilityEnum.values()) {
+ try {
+ boolean hasE = false;
+ for (String e : eItem) {
+ if (item.getValue() == e) {
+ hasE = true;
+ break;
+ }
+ }
+ if (!hasE) {
+ resultMap.put(item.getValue() + "", item.getDesc());
+ }
+ } catch (Exception ex) {
+
+ }
+ }
+ return resultMap;
+ }
+}
\ No newline at end of file
diff --git a/refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java b/refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
index 0f602c1ac3b2c98f0474a95aeca6f75ab64cf4b4..ecd9212ca7f1398b53e9142cc1940e1be75bfe75 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
@@ -4,21 +4,22 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
-* 娴峰悍浜嬩欢绫诲瀷
+* 鍛ㄤ簲鏄惁鐩戞祴(0.鍚�,1.鏄�)鏋氫妇绫�
*
* @author zxfei
*/
public enum HikEventTypeEnum {
- 閲嶇偣浜哄憳璇嗗埆浜嬩欢("event_face_recognition", "閲嶇偣浜哄憳璇嗗埆浜嬩欢");
- private String value;
+ 閲嶇偣浜哄憳璇嗗埆浜嬩欢(1644175361, "閲嶇偣浜哄憳璇嗗埆浜嬩欢"),
+ 闄岀敓浜哄憳璇嗗埆浜嬩欢(1644171265, "闄岀敓浜哄憳璇嗗埆浜嬩欢");
+ private Integer value;
private String desc;
- HikEventTypeEnum(String value, String desc) {
+ HikEventTypeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
- public String getValue() {
+ public Integer getValue() {
return this.value;
}
@@ -26,10 +27,10 @@ public enum HikEventTypeEnum {
return this.desc;
}
- public static HikEventTypeEnum getByValue(String value) {
- for (HikEventTypeEnum recognitionPlanTypeEnum : HikEventTypeEnum.values()) {
- if (recognitionPlanTypeEnum.getValue() == value) {
- return recognitionPlanTypeEnum;
+ public static HikEventTypeEnum getByValue(Integer value) {
+ for (HikEventTypeEnum fridayEnum : HikEventTypeEnum.values()) {
+ if (fridayEnum.getValue() == value) {
+ return fridayEnum;
}
}
return null;
@@ -41,12 +42,12 @@ public enum HikEventTypeEnum {
* @param eItem 涓嶅寘鍚」
* @return
*/
- public static Map<String, String> getEnumMap(String... eItem) {
+ public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (HikEventTypeEnum item : HikEventTypeEnum.values()) {
try {
boolean hasE = false;
- for (String e : eItem) {
+ for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
diff --git a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
index f864fa4fea167c272af91f151ca449ceef6930e3..9e338982058db67cd1e9c96674f1f727d29aa766 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
/**
* 鍚屾棰勭害浜烘暟銆�
+ * 瀹氭椂姣忔棩鎵ц锛屾墽琛屽墠鍒犻櫎褰撳ぉ宸茬粡鍚屾鐨勯绾︿汉
*/
@Slf4j
@Service("SyncAppointmentPersonTask")
@@ -93,7 +94,6 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
if (restTotal.getCode() == YesNoEnum.YES.getValue()) {
//鍚屾浠婂ぉ棰勭害鐢ㄦ埛
List<AppointmentDataItem> appointUserList = restTotal.getData().getData();
-
log.info("棰勭害鐢ㄦ埛鎬绘暟閲忥細{}", appointUserList.size());
if (!ObjectUtils.isEmpty(appointUserList)) {
//鏌ヨ浠婂ぉ娣诲姞鐨勯绾� 骞跺垹闄�
@@ -124,9 +124,8 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
return appointmentPersonEntity;
}).collect(Collectors.toList());
-
if (!ObjectUtils.isEmpty(newUserList)) {
- log.info("娉ㄥ唽鐢ㄦ埛鏂板锛宻ize:{}", newUserList.size());
+ log.info("棰勭害鐢ㄦ埛鏂板锛宻ize:{}", newUserList.size());
appointmentPersonService.save(newUserList);
}
}
diff --git a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
index 1538ced292c48c92f7dd9125d646fe42facc0306..338d80961eecd2e9f6b92a36364cbd6ad60b774e 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * 鍚屾娉ㄥ唽鐢ㄦ埛涓庨绾︿汉鏁般€�
+ * 鍚屾娉ㄥ唽鐢ㄦ埛鐨勮瘉浠剁収鐗囥€�
*/
@Slf4j
@Service("SyncRegisterUserPicTask")
diff --git a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
index 74905bae9a0dc06be2cfdfed714fdf1990934991..bcdd496657764a5a7381211f952f6dddadaf50aa 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
@@ -57,7 +57,8 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * 鍚屾娉ㄥ唽鐢ㄦ埛涓庨绾︿汉鏁般€�
+ * 鍚屾娉ㄥ唽鐢ㄦ埛銆�
+ * 瀹氭椂浠ヤ竴瀹氭椂闂撮棿闅旇繘琛屼汉鍛樿幏鍙� 瀹氭椂鏃堕棿瑕佹棭浜庢瘡鏃ラ绾︿汉鏁扮殑鍚屾鏃堕棿
*/
@Slf4j
@Service("SyncRegisterUserTask")
@@ -181,10 +182,10 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
personService.save(saveUserList);
}
- if (!ObjectUtils.isEmpty(delUserList)) {
- log.info("娉ㄥ唽鐢ㄦ埛鍒犻櫎锛宻ize:{}", delUserList.size());
- personService.remove(delUserList, null);
- }
+// if (!ObjectUtils.isEmpty(delUserList)) {
+// log.info("娉ㄥ唽鐢ㄦ埛鍒犻櫎锛宻ize:{}", delUserList.size());
+// personService.remove(delUserList, null);
+// }
}
diff --git a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
index f715743c1ca3d582a12edfba286e637af3efbc42..c20988d30f4d08836826750ca974040a046c5e85 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
@@ -22,7 +22,7 @@ import org.springframework.util.ObjectUtils;
import java.util.List;
/**
- * 鍚屾鐢ㄦ埛,鍞竴鏍囪瘑涓虹敤鎴峰悕銆�
+ * 鍚屾闂ㄦ埛鐢ㄦ埛,鍞竴鏍囪瘑涓虹敤鎴峰悕銆�
*/
@Slf4j
@Service("SyncUserTask")
diff --git a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
index d07caadcbdf1eba1f9cab9518e49780127c3d5a8..92e0ae59df10812602381fffd1c3620b57421bda 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
@@ -41,7 +41,9 @@ import java.util.Date;
import java.util.List;
/**
- * 鍚屾鐢ㄦ埛鍒版捣搴锋寚瀹氬簱銆�
+ * 鍚屾鐢ㄦ埛浜鸿劯鏁版嵁鍒版捣搴锋寚瀹氬簱銆�
+ * 鏃堕棿闂撮殧浠ュ悓姝ユ敞鍐岀敤鎴蜂箣鍚�
+ * 榛樿鍚屾鍒颁竴涓汉鑴哥敤鎴风粍锛屽瑕佸叾瀹冪敤鎴风粍 鍒欓〉闈笂杩涜娣诲姞
*/
@Slf4j
@Service("SyncUserToHikTask")
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java b/refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
index 2f03056f19aeedb64d6f18eeff5c9639e90356fd..c72b7a210331171d98d9dbf7400d76e71b4c8216 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
@@ -17,7 +17,6 @@ public abstract class AbstractHikService {
@Value("${hik.appSecret:''}")
protected String appSecret;
-
@Value("${hik.protocol:http://}")
protected String protocol;
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java b/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java
index b71326beac843ec6c68dc77bb87ea18338da8bd5..6f6d6fd0f2d1a6a4b415dbd69ec810133dec68c2 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java
@@ -7,6 +7,7 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.Rest;
import com.mortals.framework.util.DataUtil;
+import com.mortals.xhx.common.code.HikAbilityEnum;
import com.mortals.xhx.common.code.HikEventTypeEnum;
import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.module.hik.AbstractHikService;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 娴峰悍浜哄憳鎺ュ彛绫�
@@ -111,35 +113,34 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
//String similarity = GlobalSysInfo.getParamValue(ParamKey.PARAM_FACE_SIMILARITY, "0.8");
Params params = req.getParams();
- if (HikEventTypeEnum.閲嶇偣浜哄憳璇嗗埆浜嬩欢.getValue().equals(params.getAbility())) {
- params.getEvents();
+ if (HikAbilityEnum.浜鸿劯璇嗗埆浜嬩欢.getValue().equals(params.getAbility())) {
for (EventsItem event : params.getEvents()) {
- //浜嬩欢璇︾粏
- String eventId = event.getEventId();
- int eventType = event.getEventType();
EventData eventData = event.getData();
//璇嗗埆缁撴灉
FaceRecognitionResult faceRecognitionResult = eventData.getFaceRecognitionResult();
//鎶撴媿淇℃伅
Snap snap = faceRecognitionResult.getSnap();
- //鍖归厤鐨勭粨鏋�
- List<FaceMatchItem> faceMatchs = faceRecognitionResult.getFaceMatch();
- for (FaceMatchItem faceMatch : faceMatchs) {
+ if (HikEventTypeEnum.閲嶇偣浜哄憳璇嗗埆浜嬩欢.getValue() == event.getEventType()) {
+ //澶勭悊閲嶇偣浜哄憳浜嬩欢
+ //鍖归厤鐨勭粨鏋�
+ List<FaceMatchItem> faceMatchs = faceRecognitionResult.getFaceMatch();
+ for (FaceMatchItem faceMatch : faceMatchs) {
+ //鏍规嵁鍖归厤缁撴灉 淇濆瓨涓氬姟鏁版嵁 todo
+ if (faceMatch.getSimilarity() > similarity) {
+ //淇濆瓨褰撳墠璇嗗埆缁撴灉鍒拌褰曡〃涓�
+ }
+ }
+
+ } else if (HikEventTypeEnum.闄岀敓浜哄憳璇嗗埆浜嬩欢.getValue() == event.getEventType()) {
//涓嶈璇嗗埆缁撴灉 淇濆瓨娴侀噺鏁版嵁
RealtimeDataflowEntity realtimeDataflowEntity = new RealtimeDataflowEntity();
+ realtimeDataflowEntity.setDetectTime(event.getHappenTime());
+ String resIndexCodes = eventData.getResInfo().stream().map(i -> i.getIndexCode()).collect(Collectors.joining(","));
+ realtimeDataflowEntity.setDevice(resIndexCodes);
+ realtimeDataflowEntity.setPicUri(eventData.getFaceRecognitionResult().getSnap().getFaceUrl());
+ realtimeDataflowEntity.setEventId(event.getEventId());
+ realtimeDataflowEntity.setEventType(HikEventTypeEnum.闄岀敓浜哄憳璇嗗埆浜嬩欢.getValue().longValue());
-// realtimeDataflowEntity.setPersonId();
-// realtimeDataflowEntity.setName();
-// realtimeDataflowEntity.setDevice();
-// realtimeDataflowEntity.setDetectTime();
-// realtimeDataflowEntity.setContact();
-// realtimeDataflowEntity.setIdNumber();
-// realtimeDataflowEntity.setIsBooking();
-// realtimeDataflowEntity.setQueueNum();
-// realtimeDataflowEntity.setLocation();
-// realtimeDataflowEntity.setPicture();
-// realtimeDataflowEntity.setOrderCols();
-// realtimeDataflowEntity.setOrderColList();
realtimeDataflowEntity.setCreateUserId(1L);
realtimeDataflowEntity.setCreateTime(new Date());
@@ -149,14 +150,6 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
realtimeDataflowEntity.initAttrValue();
//dataflowService.save()
-
- //鏍规嵁鍖归厤缁撴灉 淇濆瓨涓氬姟鏁版嵁 todo
- if(faceMatch.getSimilarity()>similarity){
- //淇濆瓨褰撳墠璇嗗埆缁撴灉鍒拌褰曡〃涓�
-
- }else {
- //璇嗗埆涓洪檶鐢熶汉 淇濆瓨
- }
}
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java b/refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java
index 01cb54b84bfa565fc31638b620e6d3b59db7b7bd..931933e95b0bac1b13fca77f4264a5e99eb78ee0 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java
@@ -33,8 +33,6 @@ import static com.mortals.framework.ap.SysConstains.*;
@RequestMapping("monitor/alarm")
public class MonitorAlarmController extends BaseCRUDJsonBodyMappingController<MonitorAlarmService,MonitorAlarmEntity,Long> {
- @Autowired
- private ParamService paramService;
public MonitorAlarmController(){
super.setModuleDesc( "鐩戞祴棰勮璁板綍");
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java b/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java
index 779b7870a8daa5d056e06f2fd37690c429492f43..4157f33e81e6e755182055feb4f28481998bd452 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java
@@ -8,252 +8,325 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.realtime.model.vo.RealtimeDataflowVo;
/**
-* 浜哄憳鍙戠幇璁板綍瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2023-04-09
-*/
+ * 浜哄憳鍙戠幇璁板綍瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
public class RealtimeDataflowEntity extends RealtimeDataflowVo {
private static final long serialVersionUID = 1L;
/**
- * 绔欑偣Id
- */
+ * 绔欑偣Id
+ */
private Long siteId;
/**
- * 绔欑偣鍚嶇О
- */
+ * 绔欑偣鍚嶇О
+ */
private String siteName;
/**
- * 浜哄憳id
- */
+ * 浜哄憳id
+ */
@Excel(name = "浜哄憳id")
private Long personId;
/**
- * 濮撳悕
- */
+ * 濮撳悕
+ */
@Excel(name = "濮撳悕")
private String name;
/**
- * 鐩戞祴璁惧
- */
+ * 鐩戞祴璁惧
+ */
@Excel(name = "鐩戞祴璁惧")
private String device;
/**
- * 鐩戞祴鏃堕棿
- */
+ * 鐩戞祴鏃堕棿
+ */
@Excel(name = "鐩戞祴鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date detectTime;
/**
- * 鑱旂郴鏂瑰紡
- */
+ * 鑱旂郴鏂瑰紡
+ */
@Excel(name = "鑱旂郴鏂瑰紡")
private String contact;
/**
- * 韬唤璇佸彿鐮�
- */
+ * 韬唤璇佸彿鐮�
+ */
@Excel(name = "韬唤璇佸彿鐮�")
private String idNumber;
/**
- * 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- */
+ * 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ */
@Excel(name = "鏄惁棰勭害", readConverterExp = "0=鍚�,1=鏄�")
private Integer isBooking;
/**
- * 鎺掗槦缂栫爜
- */
+ * 鎺掗槦缂栫爜
+ */
@Excel(name = "鎺掗槦缂栫爜")
private String queueNum;
/**
- * 鍔炵悊浣嶇疆
- */
+ * 鍔炵悊浣嶇疆
+ */
@Excel(name = "鍔炵悊浣嶇疆")
private String location;
/**
- * 璇嗗埆鎴浘
- */
+ * 璇嗗埆鎴浘
+ */
@Excel(name = "璇嗗埆鎴浘")
private String picture;
+ /**
+ * 鐩稿鍥剧墖pic
+ */
+ private String picUri;
+ /**
+ * 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ */
+ private String serverIndexCode;
+ /**
+ * 浜嬩欢id
+ */
+ private String eventId;
+ /**
+ * 浜嬩欢绫诲瀷
+ */
+ @Excel(name = "浜嬩欢绫诲瀷")
+ private Long eventType;
public RealtimeDataflowEntity(){}
/**
- * 鑾峰彇 绔欑偣Id
- * @return Long
- */
+ * 鑾峰彇 绔欑偣Id
+ * @return Long
+ */
public Long getSiteId(){
return siteId;
}
/**
- * 璁剧疆 绔欑偣Id
- * @param siteId
- */
+ * 璁剧疆 绔欑偣Id
+ * @param siteId
+ */
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
- * 鑾峰彇 绔欑偣鍚嶇О
- * @return String
- */
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return String
+ */
public String getSiteName(){
return siteName;
}
/**
- * 璁剧疆 绔欑偣鍚嶇О
- * @param siteName
- */
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
public void setSiteName(String siteName){
this.siteName = siteName;
}
/**
- * 鑾峰彇 浜哄憳id
- * @return Long
- */
+ * 鑾峰彇 浜哄憳id
+ * @return Long
+ */
public Long getPersonId(){
return personId;
}
/**
- * 璁剧疆 浜哄憳id
- * @param personId
- */
+ * 璁剧疆 浜哄憳id
+ * @param personId
+ */
public void setPersonId(Long personId){
this.personId = personId;
}
/**
- * 鑾峰彇 濮撳悕
- * @return String
- */
+ * 鑾峰彇 濮撳悕
+ * @return String
+ */
public String getName(){
return name;
}
/**
- * 璁剧疆 濮撳悕
- * @param name
- */
+ * 璁剧疆 濮撳悕
+ * @param name
+ */
public void setName(String name){
this.name = name;
}
/**
- * 鑾峰彇 鐩戞祴璁惧
- * @return String
- */
+ * 鑾峰彇 鐩戞祴璁惧
+ * @return String
+ */
public String getDevice(){
return device;
}
/**
- * 璁剧疆 鐩戞祴璁惧
- * @param device
- */
+ * 璁剧疆 鐩戞祴璁惧
+ * @param device
+ */
public void setDevice(String device){
this.device = device;
}
/**
- * 鑾峰彇 鐩戞祴鏃堕棿
- * @return Date
- */
+ * 鑾峰彇 鐩戞祴鏃堕棿
+ * @return Date
+ */
public Date getDetectTime(){
return detectTime;
}
/**
- * 璁剧疆 鐩戞祴鏃堕棿
- * @param detectTime
- */
+ * 璁剧疆 鐩戞祴鏃堕棿
+ * @param detectTime
+ */
public void setDetectTime(Date detectTime){
this.detectTime = detectTime;
}
/**
- * 鑾峰彇 鑱旂郴鏂瑰紡
- * @return String
- */
+ * 鑾峰彇 鑱旂郴鏂瑰紡
+ * @return String
+ */
public String getContact(){
return contact;
}
/**
- * 璁剧疆 鑱旂郴鏂瑰紡
- * @param contact
- */
+ * 璁剧疆 鑱旂郴鏂瑰紡
+ * @param contact
+ */
public void setContact(String contact){
this.contact = contact;
}
/**
- * 鑾峰彇 韬唤璇佸彿鐮�
- * @return String
- */
+ * 鑾峰彇 韬唤璇佸彿鐮�
+ * @return String
+ */
public String getIdNumber(){
return idNumber;
}
/**
- * 璁剧疆 韬唤璇佸彿鐮�
- * @param idNumber
- */
+ * 璁剧疆 韬唤璇佸彿鐮�
+ * @param idNumber
+ */
public void setIdNumber(String idNumber){
this.idNumber = idNumber;
}
/**
- * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return Integer
- */
+ * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return Integer
+ */
public Integer getIsBooking(){
return isBooking;
}
/**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBooking
- */
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBooking
+ */
public void setIsBooking(Integer isBooking){
this.isBooking = isBooking;
}
/**
- * 鑾峰彇 鎺掗槦缂栫爜
- * @return String
- */
+ * 鑾峰彇 鎺掗槦缂栫爜
+ * @return String
+ */
public String getQueueNum(){
return queueNum;
}
/**
- * 璁剧疆 鎺掗槦缂栫爜
- * @param queueNum
- */
+ * 璁剧疆 鎺掗槦缂栫爜
+ * @param queueNum
+ */
public void setQueueNum(String queueNum){
this.queueNum = queueNum;
}
/**
- * 鑾峰彇 鍔炵悊浣嶇疆
- * @return String
- */
+ * 鑾峰彇 鍔炵悊浣嶇疆
+ * @return String
+ */
public String getLocation(){
return location;
}
/**
- * 璁剧疆 鍔炵悊浣嶇疆
- * @param location
- */
+ * 璁剧疆 鍔炵悊浣嶇疆
+ * @param location
+ */
public void setLocation(String location){
this.location = location;
}
/**
- * 鑾峰彇 璇嗗埆鎴浘
- * @return String
- */
+ * 鑾峰彇 璇嗗埆鎴浘
+ * @return String
+ */
public String getPicture(){
return picture;
}
/**
- * 璁剧疆 璇嗗埆鎴浘
- * @param picture
- */
+ * 璁剧疆 璇嗗埆鎴浘
+ * @param picture
+ */
public void setPicture(String picture){
this.picture = picture;
}
+ /**
+ * 鑾峰彇 鐩稿鍥剧墖pic
+ * @return String
+ */
+ public String getPicUri(){
+ return picUri;
+ }
+ /**
+ * 璁剧疆 鐩稿鍥剧墖pic
+ * @param picUri
+ */
+ public void setPicUri(String picUri){
+ this.picUri = picUri;
+ }
+ /**
+ * 鑾峰彇 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @return String
+ */
+ public String getServerIndexCode(){
+ return serverIndexCode;
+ }
+ /**
+ * 璁剧疆 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @param serverIndexCode
+ */
+ public void setServerIndexCode(String serverIndexCode){
+ this.serverIndexCode = serverIndexCode;
+ }
+ /**
+ * 鑾峰彇 浜嬩欢id
+ * @return String
+ */
+ public String getEventId(){
+ return eventId;
+ }
+ /**
+ * 璁剧疆 浜嬩欢id
+ * @param eventId
+ */
+ public void setEventId(String eventId){
+ this.eventId = eventId;
+ }
+ /**
+ * 鑾峰彇 浜嬩欢绫诲瀷
+ * @return Long
+ */
+ public Long getEventType(){
+ return eventType;
+ }
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventType
+ */
+ public void setEventType(Long eventType){
+ this.eventType = eventType;
+ }
@Override
public int hashCode() {
- return this.getId().hashCode();
+ return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
@@ -261,7 +334,7 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
if (obj instanceof RealtimeDataflowEntity) {
RealtimeDataflowEntity tmp = (RealtimeDataflowEntity) obj;
if (this.getId() == tmp.getId()) {
- return true;
+ return true;
}
}
return false;
@@ -281,33 +354,45 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
sb.append(",queueNum:").append(getQueueNum());
sb.append(",location:").append(getLocation());
sb.append(",picture:").append(getPicture());
+ sb.append(",picUri:").append(getPicUri());
+ sb.append(",serverIndexCode:").append(getServerIndexCode());
+ sb.append(",eventId:").append(getEventId());
+ sb.append(",eventType:").append(getEventType());
return sb.toString();
}
public void initAttrValue(){
- this.siteId = null;
+ this.siteId = null;
+
+ this.siteName = "";
+
+ this.personId = null;
+
+ this.name = "";
+
+ this.device = "";
- this.siteName = "";
+ this.detectTime = null;
- this.personId = null;
+ this.contact = "";
- this.name = "";
+ this.idNumber = "";
- this.device = "";
+ this.isBooking = 0;
- this.detectTime = null;
+ this.queueNum = "";
- this.contact = "";
+ this.location = "";
- this.idNumber = "";
+ this.picture = "";
- this.isBooking = 0;
+ this.picUri = "";
- this.queueNum = "";
+ this.serverIndexCode = "";
- this.location = "";
+ this.eventId = "";
- this.picture = "";
+ this.eventType = null;
}
}
\ No newline at end of file
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java b/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java
index 66633a4eb5ad81d118e7e439b23e45ed3df62f50..7b8e2ddce1081268bb7a6bd85c839336f29f4566 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java
@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.realtime.model.RealtimeDataflowEntity;
/**
-* 浜哄憳鍙戠幇璁板綍鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2023-04-09
-*/
+ * 浜哄憳鍙戠幇璁板綍鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
/** 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀� */
private Long idStart;
@@ -116,6 +116,36 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
/** 璇嗗埆鎴浘鎺掗櫎鍒楄〃 */
private List <String> pictureNotList;
+ /** 鐩稿鍥剧墖pic */
+ private List<String> picUriList;
+
+ /** 鐩稿鍥剧墖pic鎺掗櫎鍒楄〃 */
+ private List <String> picUriNotList;
+ /** 鍥剧墖璧勬簮鍞竴鏍囪瘑 */
+ private List<String> serverIndexCodeList;
+
+ /** 鍥剧墖璧勬簮鍞竴鏍囪瘑鎺掗櫎鍒楄〃 */
+ private List <String> serverIndexCodeNotList;
+ /** 浜嬩欢id */
+ private List<String> eventIdList;
+
+ /** 浜嬩欢id鎺掗櫎鍒楄〃 */
+ private List <String> eventIdNotList;
+ /** 寮€濮� 浜嬩欢绫诲瀷 */
+ private Long eventTypeStart;
+
+ /** 缁撴潫 浜嬩欢绫诲瀷 */
+ private Long eventTypeEnd;
+
+ /** 澧炲姞 浜嬩欢绫诲瀷 */
+ private Long eventTypeIncrement;
+
+ /** 浜嬩欢绫诲瀷鍒楄〃 */
+ private List <Long> eventTypeList;
+
+ /** 浜嬩欢绫诲瀷鎺掗櫎鍒楄〃 */
+ private List <Long> eventTypeNotList;
+
/** 寮€濮� 鍒涘缓鏃堕棿 */
private String createTimeStart;
@@ -167,1350 +197,1638 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
public RealtimeDataflowQuery(){}
/**
- * 鑾峰彇 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idStart
- */
+ * 鑾峰彇 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idStart
+ */
public Long getIdStart(){
return this.idStart;
}
/**
- * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idStart
- */
+ * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
- * 鑾峰彇 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @return $idEnd
- */
+ * 鑾峰彇 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return $idEnd
+ */
public Long getIdEnd(){
return this.idEnd;
}
/**
- * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idEnd
- */
+ * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
- * 鑾峰彇 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idIncrement
- */
+ * 鑾峰彇 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idIncrement
+ */
public Long getIdIncrement(){
return this.idIncrement;
}
/**
- * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idIncrement
- */
+ * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
- * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idList
- */
+ * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idList
+ */
public List<Long> getIdList(){
return this.idList;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idList
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
- * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idNotList
- */
+ * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idNotList
+ */
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idNotList
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
- * 鑾峰彇 寮€濮� 绔欑偣Id
- * @return siteIdStart
- */
+ * 鑾峰彇 寮€濮� 绔欑偣Id
+ * @return siteIdStart
+ */
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
- * 璁剧疆 寮€濮� 绔欑偣Id
- * @param siteIdStart
- */
+ * 璁剧疆 寮€濮� 绔欑偣Id
+ * @param siteIdStart
+ */
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
- * 鑾峰彇 缁撴潫 绔欑偣Id
- * @return $siteIdEnd
- */
+ * 鑾峰彇 缁撴潫 绔欑偣Id
+ * @return $siteIdEnd
+ */
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
- * 璁剧疆 缁撴潫 绔欑偣Id
- * @param siteIdEnd
- */
+ * 璁剧疆 缁撴潫 绔欑偣Id
+ * @param siteIdEnd
+ */
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 绔欑偣Id
- * @return siteIdIncrement
- */
+ * 鑾峰彇 澧炲姞 绔欑偣Id
+ * @return siteIdIncrement
+ */
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 绔欑偣Id
- * @param siteIdIncrement
- */
+ * 璁剧疆 澧炲姞 绔欑偣Id
+ * @param siteIdIncrement
+ */
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
- * 鑾峰彇 绔欑偣Id
- * @return siteIdList
- */
+ * 鑾峰彇 绔欑偣Id
+ * @return siteIdList
+ */
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
- * 璁剧疆 绔欑偣Id
- * @param siteIdList
- */
+ * 璁剧疆 绔欑偣Id
+ * @param siteIdList
+ */
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
- * 鑾峰彇 绔欑偣Id
- * @return siteIdNotList
- */
+ * 鑾峰彇 绔欑偣Id
+ * @return siteIdNotList
+ */
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
- * 璁剧疆 绔欑偣Id
- * @param siteIdNotList
- */
+ * 璁剧疆 绔欑偣Id
+ * @param siteIdNotList
+ */
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
- * 鑾峰彇 绔欑偣鍚嶇О
- * @return siteNameList
- */
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return siteNameList
+ */
public List<String> getSiteNameList(){
return this.siteNameList;
}
/**
- * 璁剧疆 绔欑偣鍚嶇О
- * @param siteNameList
- */
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
- * 鑾峰彇 绔欑偣鍚嶇О
- * @return siteNameNotList
- */
+ * 鑾峰彇 绔欑偣鍚嶇О
+ * @return siteNameNotList
+ */
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
- * 璁剧疆 绔欑偣鍚嶇О
- * @param siteNameNotList
- */
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameNotList
+ */
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/**
- * 鑾峰彇 寮€濮� 浜哄憳id
- * @return personIdStart
- */
+ * 鑾峰彇 寮€濮� 浜哄憳id
+ * @return personIdStart
+ */
public Long getPersonIdStart(){
return this.personIdStart;
}
/**
- * 璁剧疆 寮€濮� 浜哄憳id
- * @param personIdStart
- */
+ * 璁剧疆 寮€濮� 浜哄憳id
+ * @param personIdStart
+ */
public void setPersonIdStart(Long personIdStart){
this.personIdStart = personIdStart;
}
/**
- * 鑾峰彇 缁撴潫 浜哄憳id
- * @return $personIdEnd
- */
+ * 鑾峰彇 缁撴潫 浜哄憳id
+ * @return $personIdEnd
+ */
public Long getPersonIdEnd(){
return this.personIdEnd;
}
/**
- * 璁剧疆 缁撴潫 浜哄憳id
- * @param personIdEnd
- */
+ * 璁剧疆 缁撴潫 浜哄憳id
+ * @param personIdEnd
+ */
public void setPersonIdEnd(Long personIdEnd){
this.personIdEnd = personIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 浜哄憳id
- * @return personIdIncrement
- */
+ * 鑾峰彇 澧炲姞 浜哄憳id
+ * @return personIdIncrement
+ */
public Long getPersonIdIncrement(){
return this.personIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 浜哄憳id
- * @param personIdIncrement
- */
+ * 璁剧疆 澧炲姞 浜哄憳id
+ * @param personIdIncrement
+ */
public void setPersonIdIncrement(Long personIdIncrement){
this.personIdIncrement = personIdIncrement;
}
/**
- * 鑾峰彇 浜哄憳id
- * @return personIdList
- */
+ * 鑾峰彇 浜哄憳id
+ * @return personIdList
+ */
public List<Long> getPersonIdList(){
return this.personIdList;
}
/**
- * 璁剧疆 浜哄憳id
- * @param personIdList
- */
+ * 璁剧疆 浜哄憳id
+ * @param personIdList
+ */
public void setPersonIdList(List<Long> personIdList){
this.personIdList = personIdList;
}
/**
- * 鑾峰彇 浜哄憳id
- * @return personIdNotList
- */
+ * 鑾峰彇 浜哄憳id
+ * @return personIdNotList
+ */
public List<Long> getPersonIdNotList(){
return this.personIdNotList;
}
/**
- * 璁剧疆 浜哄憳id
- * @param personIdNotList
- */
+ * 璁剧疆 浜哄憳id
+ * @param personIdNotList
+ */
public void setPersonIdNotList(List<Long> personIdNotList){
this.personIdNotList = personIdNotList;
}
/**
- * 鑾峰彇 濮撳悕
- * @return nameList
- */
+ * 鑾峰彇 濮撳悕
+ * @return nameList
+ */
public List<String> getNameList(){
return this.nameList;
}
/**
- * 璁剧疆 濮撳悕
- * @param nameList
- */
+ * 璁剧疆 濮撳悕
+ * @param nameList
+ */
public void setNameList(List<String> nameList){
this.nameList = nameList;
}
/**
- * 鑾峰彇 濮撳悕
- * @return nameNotList
- */
+ * 鑾峰彇 濮撳悕
+ * @return nameNotList
+ */
public List<String> getNameNotList(){
return this.nameNotList;
}
/**
- * 璁剧疆 濮撳悕
- * @param nameNotList
- */
+ * 璁剧疆 濮撳悕
+ * @param nameNotList
+ */
public void setNameNotList(List<String> nameNotList){
this.nameNotList = nameNotList;
}
/**
- * 鑾峰彇 鐩戞祴璁惧
- * @return deviceList
- */
+ * 鑾峰彇 鐩戞祴璁惧
+ * @return deviceList
+ */
public List<String> getDeviceList(){
return this.deviceList;
}
/**
- * 璁剧疆 鐩戞祴璁惧
- * @param deviceList
- */
+ * 璁剧疆 鐩戞祴璁惧
+ * @param deviceList
+ */
public void setDeviceList(List<String> deviceList){
this.deviceList = deviceList;
}
/**
- * 鑾峰彇 鐩戞祴璁惧
- * @return deviceNotList
- */
+ * 鑾峰彇 鐩戞祴璁惧
+ * @return deviceNotList
+ */
public List<String> getDeviceNotList(){
return this.deviceNotList;
}
/**
- * 璁剧疆 鐩戞祴璁惧
- * @param deviceNotList
- */
+ * 璁剧疆 鐩戞祴璁惧
+ * @param deviceNotList
+ */
public void setDeviceNotList(List<String> deviceNotList){
this.deviceNotList = deviceNotList;
}
/**
- * 鑾峰彇 寮€濮� 鐩戞祴鏃堕棿
- * @return detectTimeStart
- */
+ * 鑾峰彇 寮€濮� 鐩戞祴鏃堕棿
+ * @return detectTimeStart
+ */
public String getDetectTimeStart(){
return this.detectTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鐩戞祴鏃堕棿
- * @param detectTimeStart
- */
+ * 璁剧疆 寮€濮� 鐩戞祴鏃堕棿
+ * @param detectTimeStart
+ */
public void setDetectTimeStart(String detectTimeStart){
this.detectTimeStart = detectTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鐩戞祴鏃堕棿
- * @return detectTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鐩戞祴鏃堕棿
+ * @return detectTimeEnd
+ */
public String getDetectTimeEnd(){
return this.detectTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鐩戞祴鏃堕棿
- * @param detectTimeEnd
- */
+ * 璁剧疆 缁撴潫 鐩戞祴鏃堕棿
+ * @param detectTimeEnd
+ */
public void setDetectTimeEnd(String detectTimeEnd){
this.detectTimeEnd = detectTimeEnd;
}
/**
- * 鑾峰彇 鑱旂郴鏂瑰紡
- * @return contactList
- */
+ * 鑾峰彇 鑱旂郴鏂瑰紡
+ * @return contactList
+ */
public List<String> getContactList(){
return this.contactList;
}
/**
- * 璁剧疆 鑱旂郴鏂瑰紡
- * @param contactList
- */
+ * 璁剧疆 鑱旂郴鏂瑰紡
+ * @param contactList
+ */
public void setContactList(List<String> contactList){
this.contactList = contactList;
}
/**
- * 鑾峰彇 鑱旂郴鏂瑰紡
- * @return contactNotList
- */
+ * 鑾峰彇 鑱旂郴鏂瑰紡
+ * @return contactNotList
+ */
public List<String> getContactNotList(){
return this.contactNotList;
}
/**
- * 璁剧疆 鑱旂郴鏂瑰紡
- * @param contactNotList
- */
+ * 璁剧疆 鑱旂郴鏂瑰紡
+ * @param contactNotList
+ */
public void setContactNotList(List<String> contactNotList){
this.contactNotList = contactNotList;
}
/**
- * 鑾峰彇 韬唤璇佸彿鐮�
- * @return idNumberList
- */
+ * 鑾峰彇 韬唤璇佸彿鐮�
+ * @return idNumberList
+ */
public List<String> getIdNumberList(){
return this.idNumberList;
}
/**
- * 璁剧疆 韬唤璇佸彿鐮�
- * @param idNumberList
- */
+ * 璁剧疆 韬唤璇佸彿鐮�
+ * @param idNumberList
+ */
public void setIdNumberList(List<String> idNumberList){
this.idNumberList = idNumberList;
}
/**
- * 鑾峰彇 韬唤璇佸彿鐮�
- * @return idNumberNotList
- */
+ * 鑾峰彇 韬唤璇佸彿鐮�
+ * @return idNumberNotList
+ */
public List<String> getIdNumberNotList(){
return this.idNumberNotList;
}
/**
- * 璁剧疆 韬唤璇佸彿鐮�
- * @param idNumberNotList
- */
+ * 璁剧疆 韬唤璇佸彿鐮�
+ * @param idNumberNotList
+ */
public void setIdNumberNotList(List<String> idNumberNotList){
this.idNumberNotList = idNumberNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return isBookingStart
- */
+ * 鑾峰彇 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return isBookingStart
+ */
public Integer getIsBookingStart(){
return this.isBookingStart;
}
/**
- * 璁剧疆 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingStart
- */
+ * 璁剧疆 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingStart
+ */
public void setIsBookingStart(Integer isBookingStart){
this.isBookingStart = isBookingStart;
}
/**
- * 鑾峰彇 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return $isBookingEnd
- */
+ * 鑾峰彇 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return $isBookingEnd
+ */
public Integer getIsBookingEnd(){
return this.isBookingEnd;
}
/**
- * 璁剧疆 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingEnd
- */
+ * 璁剧疆 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingEnd
+ */
public void setIsBookingEnd(Integer isBookingEnd){
this.isBookingEnd = isBookingEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return isBookingIncrement
- */
+ * 鑾峰彇 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return isBookingIncrement
+ */
public Integer getIsBookingIncrement(){
return this.isBookingIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingIncrement
- */
+ * 璁剧疆 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingIncrement
+ */
public void setIsBookingIncrement(Integer isBookingIncrement){
this.isBookingIncrement = isBookingIncrement;
}
/**
- * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return isBookingList
- */
+ * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return isBookingList
+ */
public List<Integer> getIsBookingList(){
return this.isBookingList;
}
/**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingList
- */
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingList
+ */
public void setIsBookingList(List<Integer> isBookingList){
this.isBookingList = isBookingList;
}
/**
- * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @return isBookingNotList
- */
+ * 鑾峰彇 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @return isBookingNotList
+ */
public List<Integer> getIsBookingNotList(){
return this.isBookingNotList;
}
/**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingNotList
- */
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingNotList
+ */
public void setIsBookingNotList(List<Integer> isBookingNotList){
this.isBookingNotList = isBookingNotList;
}
/**
- * 鑾峰彇 鎺掗槦缂栫爜
- * @return queueNumList
- */
+ * 鑾峰彇 鎺掗槦缂栫爜
+ * @return queueNumList
+ */
public List<String> getQueueNumList(){
return this.queueNumList;
}
/**
- * 璁剧疆 鎺掗槦缂栫爜
- * @param queueNumList
- */
+ * 璁剧疆 鎺掗槦缂栫爜
+ * @param queueNumList
+ */
public void setQueueNumList(List<String> queueNumList){
this.queueNumList = queueNumList;
}
/**
- * 鑾峰彇 鎺掗槦缂栫爜
- * @return queueNumNotList
- */
+ * 鑾峰彇 鎺掗槦缂栫爜
+ * @return queueNumNotList
+ */
public List<String> getQueueNumNotList(){
return this.queueNumNotList;
}
/**
- * 璁剧疆 鎺掗槦缂栫爜
- * @param queueNumNotList
- */
+ * 璁剧疆 鎺掗槦缂栫爜
+ * @param queueNumNotList
+ */
public void setQueueNumNotList(List<String> queueNumNotList){
this.queueNumNotList = queueNumNotList;
}
/**
- * 鑾峰彇 鍔炵悊浣嶇疆
- * @return locationList
- */
+ * 鑾峰彇 鍔炵悊浣嶇疆
+ * @return locationList
+ */
public List<String> getLocationList(){
return this.locationList;
}
/**
- * 璁剧疆 鍔炵悊浣嶇疆
- * @param locationList
- */
+ * 璁剧疆 鍔炵悊浣嶇疆
+ * @param locationList
+ */
public void setLocationList(List<String> locationList){
this.locationList = locationList;
}
/**
- * 鑾峰彇 鍔炵悊浣嶇疆
- * @return locationNotList
- */
+ * 鑾峰彇 鍔炵悊浣嶇疆
+ * @return locationNotList
+ */
public List<String> getLocationNotList(){
return this.locationNotList;
}
/**
- * 璁剧疆 鍔炵悊浣嶇疆
- * @param locationNotList
- */
+ * 璁剧疆 鍔炵悊浣嶇疆
+ * @param locationNotList
+ */
public void setLocationNotList(List<String> locationNotList){
this.locationNotList = locationNotList;
}
/**
- * 鑾峰彇 璇嗗埆鎴浘
- * @return pictureList
- */
+ * 鑾峰彇 璇嗗埆鎴浘
+ * @return pictureList
+ */
public List<String> getPictureList(){
return this.pictureList;
}
/**
- * 璁剧疆 璇嗗埆鎴浘
- * @param pictureList
- */
+ * 璁剧疆 璇嗗埆鎴浘
+ * @param pictureList
+ */
public void setPictureList(List<String> pictureList){
this.pictureList = pictureList;
}
/**
- * 鑾峰彇 璇嗗埆鎴浘
- * @return pictureNotList
- */
+ * 鑾峰彇 璇嗗埆鎴浘
+ * @return pictureNotList
+ */
public List<String> getPictureNotList(){
return this.pictureNotList;
}
/**
- * 璁剧疆 璇嗗埆鎴浘
- * @param pictureNotList
- */
+ * 璁剧疆 璇嗗埆鎴浘
+ * @param pictureNotList
+ */
public void setPictureNotList(List<String> pictureNotList){
this.pictureNotList = pictureNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
- * @return createTimeStart
- */
+ * 鑾峰彇 鐩稿鍥剧墖pic
+ * @return picUriList
+ */
+ public List<String> getPicUriList(){
+ return this.picUriList;
+ }
+
+ /**
+ * 璁剧疆 鐩稿鍥剧墖pic
+ * @param picUriList
+ */
+ public void setPicUriList(List<String> picUriList){
+ this.picUriList = picUriList;
+ }
+
+ /**
+ * 鑾峰彇 鐩稿鍥剧墖pic
+ * @return picUriNotList
+ */
+ public List<String> getPicUriNotList(){
+ return this.picUriNotList;
+ }
+
+ /**
+ * 璁剧疆 鐩稿鍥剧墖pic
+ * @param picUriNotList
+ */
+ public void setPicUriNotList(List<String> picUriNotList){
+ this.picUriNotList = picUriNotList;
+ }
+
+ /**
+ * 鑾峰彇 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @return serverIndexCodeList
+ */
+ public List<String> getServerIndexCodeList(){
+ return this.serverIndexCodeList;
+ }
+
+ /**
+ * 璁剧疆 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @param serverIndexCodeList
+ */
+ public void setServerIndexCodeList(List<String> serverIndexCodeList){
+ this.serverIndexCodeList = serverIndexCodeList;
+ }
+
+ /**
+ * 鑾峰彇 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @return serverIndexCodeNotList
+ */
+ public List<String> getServerIndexCodeNotList(){
+ return this.serverIndexCodeNotList;
+ }
+
+ /**
+ * 璁剧疆 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @param serverIndexCodeNotList
+ */
+ public void setServerIndexCodeNotList(List<String> serverIndexCodeNotList){
+ this.serverIndexCodeNotList = serverIndexCodeNotList;
+ }
+
+ /**
+ * 鑾峰彇 浜嬩欢id
+ * @return eventIdList
+ */
+ public List<String> getEventIdList(){
+ return this.eventIdList;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢id
+ * @param eventIdList
+ */
+ public void setEventIdList(List<String> eventIdList){
+ this.eventIdList = eventIdList;
+ }
+
+ /**
+ * 鑾峰彇 浜嬩欢id
+ * @return eventIdNotList
+ */
+ public List<String> getEventIdNotList(){
+ return this.eventIdNotList;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢id
+ * @param eventIdNotList
+ */
+ public void setEventIdNotList(List<String> eventIdNotList){
+ this.eventIdNotList = eventIdNotList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 浜嬩欢绫诲瀷
+ * @return eventTypeStart
+ */
+ public Long getEventTypeStart(){
+ return this.eventTypeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜嬩欢绫诲瀷
+ * @param eventTypeStart
+ */
+ public void setEventTypeStart(Long eventTypeStart){
+ this.eventTypeStart = eventTypeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 浜嬩欢绫诲瀷
+ * @return $eventTypeEnd
+ */
+ public Long getEventTypeEnd(){
+ return this.eventTypeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 浜嬩欢绫诲瀷
+ * @param eventTypeEnd
+ */
+ public void setEventTypeEnd(Long eventTypeEnd){
+ this.eventTypeEnd = eventTypeEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 浜嬩欢绫诲瀷
+ * @return eventTypeIncrement
+ */
+ public Long getEventTypeIncrement(){
+ return this.eventTypeIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 浜嬩欢绫诲瀷
+ * @param eventTypeIncrement
+ */
+ public void setEventTypeIncrement(Long eventTypeIncrement){
+ this.eventTypeIncrement = eventTypeIncrement;
+ }
+
+ /**
+ * 鑾峰彇 浜嬩欢绫诲瀷
+ * @return eventTypeList
+ */
+ public List<Long> getEventTypeList(){
+ return this.eventTypeList;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventTypeList
+ */
+ public void setEventTypeList(List<Long> eventTypeList){
+ this.eventTypeList = eventTypeList;
+ }
+
+ /**
+ * 鑾峰彇 浜嬩欢绫诲瀷
+ * @return eventTypeNotList
+ */
+ public List<Long> getEventTypeNotList(){
+ return this.eventTypeNotList;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventTypeNotList
+ */
+ public void setEventTypeNotList(List<Long> eventTypeNotList){
+ this.eventTypeNotList = eventTypeNotList;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @return createTimeStart
+ */
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
- * @param createTimeStart
- */
+ * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+ * @param createTimeStart
+ */
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
- * @return createTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+ * @return createTimeEnd
+ */
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
- * @param createTimeEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+ * @param createTimeEnd
+ */
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
- * 鑾峰彇 寮€濮� 鍒涘缓浜篿d
- * @return createUserIdStart
- */
+ * 鑾峰彇 寮€濮� 鍒涘缓浜篿d
+ * @return createUserIdStart
+ */
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
- * 璁剧疆 寮€濮� 鍒涘缓浜篿d
- * @param createUserIdStart
- */
+ * 璁剧疆 寮€濮� 鍒涘缓浜篿d
+ * @param createUserIdStart
+ */
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鍒涘缓浜篿d
- * @return $createUserIdEnd
- */
+ * 鑾峰彇 缁撴潫 鍒涘缓浜篿d
+ * @return $createUserIdEnd
+ */
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓浜篿d
- * @param createUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓浜篿d
+ * @param createUserIdEnd
+ */
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍒涘缓浜篿d
- * @return createUserIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鍒涘缓浜篿d
+ * @return createUserIdIncrement
+ */
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍒涘缓浜篿d
- * @param createUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍒涘缓浜篿d
+ * @param createUserIdIncrement
+ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
- * 鑾峰彇 鍒涘缓浜篿d
- * @return createUserIdList
- */
+ * 鑾峰彇 鍒涘缓浜篿d
+ * @return createUserIdList
+ */
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdList
- */
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdList
+ */
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
- * 鑾峰彇 鍒涘缓浜篿d
- * @return createUserIdNotList
- */
+ * 鑾峰彇 鍒涘缓浜篿d
+ * @return createUserIdNotList
+ */
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdNotList
- */
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdNotList
+ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
- * @return updateTimeStart
- */
+ * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
+ * @return updateTimeStart
+ */
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
- * @param updateTimeStart
- */
+ * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
+ * @param updateTimeStart
+ */
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
- * @return updateTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
+ * @return updateTimeEnd
+ */
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
- * @param updateTimeEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
+ * @param updateTimeEnd
+ */
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
- * 鑾峰彇 寮€濮� 鏇存柊浜篿d
- * @return updateUserIdStart
- */
+ * 鑾峰彇 寮€濮� 鏇存柊浜篿d
+ * @return updateUserIdStart
+ */
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊浜篿d
- * @param updateUserIdStart
- */
+ * 璁剧疆 寮€濮� 鏇存柊浜篿d
+ * @param updateUserIdStart
+ */
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊浜篿d
- * @return $updateUserIdEnd
- */
+ * 鑾峰彇 缁撴潫 鏇存柊浜篿d
+ * @return $updateUserIdEnd
+ */
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊浜篿d
- * @param updateUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊浜篿d
+ * @param updateUserIdEnd
+ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏇存柊浜篿d
- * @return updateUserIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鏇存柊浜篿d
+ * @return updateUserIdIncrement
+ */
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊浜篿d
- * @param updateUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鏇存柊浜篿d
+ * @param updateUserIdIncrement
+ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
- * 鑾峰彇 鏇存柊浜篿d
- * @return updateUserIdList
- */
+ * 鑾峰彇 鏇存柊浜篿d
+ * @return updateUserIdList
+ */
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdList
- */
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdList
+ */
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
- * 鑾峰彇 鏇存柊浜篿d
- * @return updateUserIdNotList
- */
+ * 鑾峰彇 鏇存柊浜篿d
+ * @return updateUserIdNotList
+ */
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdNotList
- */
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdNotList
+ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param id
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param id
+ */
public RealtimeDataflowQuery id(Long id){
- setId(id);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idStart
- */
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
public RealtimeDataflowQuery idStart(Long idStart){
- this.idStart = idStart;
- return this;
+ this.idStart = idStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idEnd
- */
+ * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
public RealtimeDataflowQuery idEnd(Long idEnd){
- this.idEnd = idEnd;
- return this;
+ this.idEnd = idEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idIncrement
- */
+ * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
public RealtimeDataflowQuery idIncrement(Long idIncrement){
- this.idIncrement = idIncrement;
- return this;
+ this.idIncrement = idIncrement;
+ return this;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idList
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
public RealtimeDataflowQuery idList(List<Long> idList){
this.idList = idList;
- return this;
- }
-
- /**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idNotList
- */
- public RealtimeDataflowQuery idNotList(List<Long> idNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
+ public RealtimeDataflowQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
- }
+ }
/**
- * 璁剧疆 绔欑偣Id
- * @param siteId
- */
+ * 璁剧疆 绔欑偣Id
+ * @param siteId
+ */
public RealtimeDataflowQuery siteId(Long siteId){
- setSiteId(siteId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 绔欑偣Id
- * @param siteIdStart
- */
+ setSiteId(siteId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 绔欑偣Id
+ * @param siteIdStart
+ */
public RealtimeDataflowQuery siteIdStart(Long siteIdStart){
- this.siteIdStart = siteIdStart;
- return this;
+ this.siteIdStart = siteIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 绔欑偣Id
- * @param siteIdEnd
- */
+ * 璁剧疆 缁撴潫 绔欑偣Id
+ * @param siteIdEnd
+ */
public RealtimeDataflowQuery siteIdEnd(Long siteIdEnd){
- this.siteIdEnd = siteIdEnd;
- return this;
+ this.siteIdEnd = siteIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 绔欑偣Id
- * @param siteIdIncrement
- */
+ * 璁剧疆 澧炲姞 绔欑偣Id
+ * @param siteIdIncrement
+ */
public RealtimeDataflowQuery siteIdIncrement(Long siteIdIncrement){
- this.siteIdIncrement = siteIdIncrement;
- return this;
+ this.siteIdIncrement = siteIdIncrement;
+ return this;
}
/**
- * 璁剧疆 绔欑偣Id
- * @param siteIdList
- */
+ * 璁剧疆 绔欑偣Id
+ * @param siteIdList
+ */
public RealtimeDataflowQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
- return this;
- }
-
- /**
- * 璁剧疆 绔欑偣Id
- * @param siteIdNotList
- */
- public RealtimeDataflowQuery siteIdNotList(List<Long> siteIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 绔欑偣Id
+ * @param siteIdNotList
+ */
+ public RealtimeDataflowQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 绔欑偣鍚嶇О
- * @param siteName
- */
+ /**
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteName
+ */
public RealtimeDataflowQuery siteName(String siteName){
setSiteName(siteName);
- return this;
+ return this;
}
/**
- * 璁剧疆 绔欑偣鍚嶇О
- * @param siteNameList
- */
+ * 璁剧疆 绔欑偣鍚嶇О
+ * @param siteNameList
+ */
public RealtimeDataflowQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
- return this;
+ return this;
}
/**
- * 璁剧疆 浜哄憳id
- * @param personId
- */
+ * 璁剧疆 浜哄憳id
+ * @param personId
+ */
public RealtimeDataflowQuery personId(Long personId){
- setPersonId(personId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 浜哄憳id
- * @param personIdStart
- */
+ setPersonId(personId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜哄憳id
+ * @param personIdStart
+ */
public RealtimeDataflowQuery personIdStart(Long personIdStart){
- this.personIdStart = personIdStart;
- return this;
+ this.personIdStart = personIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 浜哄憳id
- * @param personIdEnd
- */
+ * 璁剧疆 缁撴潫 浜哄憳id
+ * @param personIdEnd
+ */
public RealtimeDataflowQuery personIdEnd(Long personIdEnd){
- this.personIdEnd = personIdEnd;
- return this;
+ this.personIdEnd = personIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 浜哄憳id
- * @param personIdIncrement
- */
+ * 璁剧疆 澧炲姞 浜哄憳id
+ * @param personIdIncrement
+ */
public RealtimeDataflowQuery personIdIncrement(Long personIdIncrement){
- this.personIdIncrement = personIdIncrement;
- return this;
+ this.personIdIncrement = personIdIncrement;
+ return this;
}
/**
- * 璁剧疆 浜哄憳id
- * @param personIdList
- */
+ * 璁剧疆 浜哄憳id
+ * @param personIdList
+ */
public RealtimeDataflowQuery personIdList(List<Long> personIdList){
this.personIdList = personIdList;
- return this;
- }
-
- /**
- * 璁剧疆 浜哄憳id
- * @param personIdNotList
- */
- public RealtimeDataflowQuery personIdNotList(List<Long> personIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜哄憳id
+ * @param personIdNotList
+ */
+ public RealtimeDataflowQuery personIdNotList(List<Long> personIdNotList){
this.personIdNotList = personIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 濮撳悕
- * @param name
- */
+ /**
+ * 璁剧疆 濮撳悕
+ * @param name
+ */
public RealtimeDataflowQuery name(String name){
setName(name);
- return this;
+ return this;
}
/**
- * 璁剧疆 濮撳悕
- * @param nameList
- */
+ * 璁剧疆 濮撳悕
+ * @param nameList
+ */
public RealtimeDataflowQuery nameList(List<String> nameList){
this.nameList = nameList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鐩戞祴璁惧
- * @param device
- */
+ /**
+ * 璁剧疆 鐩戞祴璁惧
+ * @param device
+ */
public RealtimeDataflowQuery device(String device){
setDevice(device);
- return this;
+ return this;
}
/**
- * 璁剧疆 鐩戞祴璁惧
- * @param deviceList
- */
+ * 璁剧疆 鐩戞祴璁惧
+ * @param deviceList
+ */
public RealtimeDataflowQuery deviceList(List<String> deviceList){
this.deviceList = deviceList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鑱旂郴鏂瑰紡
- * @param contact
- */
+ /**
+ * 璁剧疆 鑱旂郴鏂瑰紡
+ * @param contact
+ */
public RealtimeDataflowQuery contact(String contact){
setContact(contact);
- return this;
+ return this;
}
/**
- * 璁剧疆 鑱旂郴鏂瑰紡
- * @param contactList
- */
+ * 璁剧疆 鑱旂郴鏂瑰紡
+ * @param contactList
+ */
public RealtimeDataflowQuery contactList(List<String> contactList){
this.contactList = contactList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 韬唤璇佸彿鐮�
- * @param idNumber
- */
+ /**
+ * 璁剧疆 韬唤璇佸彿鐮�
+ * @param idNumber
+ */
public RealtimeDataflowQuery idNumber(String idNumber){
setIdNumber(idNumber);
- return this;
+ return this;
}
/**
- * 璁剧疆 韬唤璇佸彿鐮�
- * @param idNumberList
- */
+ * 璁剧疆 韬唤璇佸彿鐮�
+ * @param idNumberList
+ */
public RealtimeDataflowQuery idNumberList(List<String> idNumberList){
this.idNumberList = idNumberList;
- return this;
+ return this;
}
/**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBooking
- */
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBooking
+ */
public RealtimeDataflowQuery isBooking(Integer isBooking){
- setIsBooking(isBooking);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingStart
- */
+ setIsBooking(isBooking);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingStart
+ */
public RealtimeDataflowQuery isBookingStart(Integer isBookingStart){
- this.isBookingStart = isBookingStart;
- return this;
+ this.isBookingStart = isBookingStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingEnd
- */
+ * 璁剧疆 缁撴潫 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingEnd
+ */
public RealtimeDataflowQuery isBookingEnd(Integer isBookingEnd){
- this.isBookingEnd = isBookingEnd;
- return this;
+ this.isBookingEnd = isBookingEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingIncrement
- */
+ * 璁剧疆 澧炲姞 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingIncrement
+ */
public RealtimeDataflowQuery isBookingIncrement(Integer isBookingIncrement){
- this.isBookingIncrement = isBookingIncrement;
- return this;
+ this.isBookingIncrement = isBookingIncrement;
+ return this;
}
/**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingList
- */
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingList
+ */
public RealtimeDataflowQuery isBookingList(List<Integer> isBookingList){
this.isBookingList = isBookingList;
- return this;
- }
-
- /**
- * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
- * @param isBookingNotList
- */
- public RealtimeDataflowQuery isBookingNotList(List<Integer> isBookingNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏄惁棰勭害(0.鍚︼紝1.鏄�)
+ * @param isBookingNotList
+ */
+ public RealtimeDataflowQuery isBookingNotList(List<Integer> isBookingNotList){
this.isBookingNotList = isBookingNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 鎺掗槦缂栫爜
- * @param queueNum
- */
+ /**
+ * 璁剧疆 鎺掗槦缂栫爜
+ * @param queueNum
+ */
public RealtimeDataflowQuery queueNum(String queueNum){
setQueueNum(queueNum);
- return this;
+ return this;
}
/**
- * 璁剧疆 鎺掗槦缂栫爜
- * @param queueNumList
- */
+ * 璁剧疆 鎺掗槦缂栫爜
+ * @param queueNumList
+ */
public RealtimeDataflowQuery queueNumList(List<String> queueNumList){
this.queueNumList = queueNumList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鍔炵悊浣嶇疆
- * @param location
- */
+ /**
+ * 璁剧疆 鍔炵悊浣嶇疆
+ * @param location
+ */
public RealtimeDataflowQuery location(String location){
setLocation(location);
- return this;
+ return this;
}
/**
- * 璁剧疆 鍔炵悊浣嶇疆
- * @param locationList
- */
+ * 璁剧疆 鍔炵悊浣嶇疆
+ * @param locationList
+ */
public RealtimeDataflowQuery locationList(List<String> locationList){
this.locationList = locationList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 璇嗗埆鎴浘
- * @param picture
- */
+ /**
+ * 璁剧疆 璇嗗埆鎴浘
+ * @param picture
+ */
public RealtimeDataflowQuery picture(String picture){
setPicture(picture);
- return this;
+ return this;
}
/**
- * 璁剧疆 璇嗗埆鎴浘
- * @param pictureList
- */
+ * 璁剧疆 璇嗗埆鎴浘
+ * @param pictureList
+ */
public RealtimeDataflowQuery pictureList(List<String> pictureList){
this.pictureList = pictureList;
- return this;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐩稿鍥剧墖pic
+ * @param picUri
+ */
+ public RealtimeDataflowQuery picUri(String picUri){
+ setPicUri(picUri);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐩稿鍥剧墖pic
+ * @param picUriList
+ */
+ public RealtimeDataflowQuery picUriList(List<String> picUriList){
+ this.picUriList = picUriList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @param serverIndexCode
+ */
+ public RealtimeDataflowQuery serverIndexCode(String serverIndexCode){
+ setServerIndexCode(serverIndexCode);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍥剧墖璧勬簮鍞竴鏍囪瘑
+ * @param serverIndexCodeList
+ */
+ public RealtimeDataflowQuery serverIndexCodeList(List<String> serverIndexCodeList){
+ this.serverIndexCodeList = serverIndexCodeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 浜嬩欢id
+ * @param eventId
+ */
+ public RealtimeDataflowQuery eventId(String eventId){
+ setEventId(eventId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢id
+ * @param eventIdList
+ */
+ public RealtimeDataflowQuery eventIdList(List<String> eventIdList){
+ this.eventIdList = eventIdList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventType
+ */
+ public RealtimeDataflowQuery eventType(Long eventType){
+ setEventType(eventType);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 浜嬩欢绫诲瀷
+ * @param eventTypeStart
+ */
+ public RealtimeDataflowQuery eventTypeStart(Long eventTypeStart){
+ this.eventTypeStart = eventTypeStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 浜嬩欢绫诲瀷
+ * @param eventTypeEnd
+ */
+ public RealtimeDataflowQuery eventTypeEnd(Long eventTypeEnd){
+ this.eventTypeEnd = eventTypeEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 浜嬩欢绫诲瀷
+ * @param eventTypeIncrement
+ */
+ public RealtimeDataflowQuery eventTypeIncrement(Long eventTypeIncrement){
+ this.eventTypeIncrement = eventTypeIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventTypeList
+ */
+ public RealtimeDataflowQuery eventTypeList(List<Long> eventTypeList){
+ this.eventTypeList = eventTypeList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 浜嬩欢绫诲瀷
+ * @param eventTypeNotList
+ */
+ public RealtimeDataflowQuery eventTypeNotList(List<Long> eventTypeNotList){
+ this.eventTypeNotList = eventTypeNotList;
+ return this;
}
/**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserId
- */
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserId
+ */
public RealtimeDataflowQuery createUserId(Long createUserId){
- setCreateUserId(createUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓浜篿d
- * @param createUserIdStart
- */
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓浜篿d
+ * @param createUserIdStart
+ */
public RealtimeDataflowQuery createUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- return this;
+ this.createUserIdStart = createUserIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓浜篿d
- * @param createUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓浜篿d
+ * @param createUserIdEnd
+ */
public RealtimeDataflowQuery createUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- return this;
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍒涘缓浜篿d
- * @param createUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍒涘缓浜篿d
+ * @param createUserIdIncrement
+ */
public RealtimeDataflowQuery createUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- return this;
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdList
- */
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdList
+ */
public RealtimeDataflowQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdNotList
- */
- public RealtimeDataflowQuery createUserIdNotList(List<Long> createUserIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdNotList
+ */
+ public RealtimeDataflowQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserId
- */
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserId
+ */
public RealtimeDataflowQuery updateUserId(Long updateUserId){
- setUpdateUserId(updateUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏇存柊浜篿d
- * @param updateUserIdStart
- */
+ setUpdateUserId(updateUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏇存柊浜篿d
+ * @param updateUserIdStart
+ */
public RealtimeDataflowQuery updateUserIdStart(Long updateUserIdStart){
- this.updateUserIdStart = updateUserIdStart;
- return this;
+ this.updateUserIdStart = updateUserIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊浜篿d
- * @param updateUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊浜篿d
+ * @param updateUserIdEnd
+ */
public RealtimeDataflowQuery updateUserIdEnd(Long updateUserIdEnd){
- this.updateUserIdEnd = updateUserIdEnd;
- return this;
+ this.updateUserIdEnd = updateUserIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊浜篿d
- * @param updateUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鏇存柊浜篿d
+ * @param updateUserIdIncrement
+ */
public RealtimeDataflowQuery updateUserIdIncrement(Long updateUserIdIncrement){
- this.updateUserIdIncrement = updateUserIdIncrement;
- return this;
+ this.updateUserIdIncrement = updateUserIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdList
- */
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdList
+ */
public RealtimeDataflowQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdNotList
- */
- public RealtimeDataflowQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdNotList
+ */
+ public RealtimeDataflowQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
- }
+ }
/**
- * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @return orConditionList
- */
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
public List<RealtimeDataflowQuery> getOrConditionList(){
- return this.orConditionList;
+ return this.orConditionList;
}
/**
- * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @param orConditionList
- */
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
public void setOrConditionList(List<RealtimeDataflowQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
- * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @return andConditionList
- */
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
public List<RealtimeDataflowQuery> getAndConditionList(){
return this.andConditionList;
}
/**
- * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @param andConditionList
- */
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
public void setAndConditionList(List<RealtimeDataflowQuery> andConditionList){
this.andConditionList = andConditionList;
}
diff --git a/refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml b/refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
index 30d9c80f78aa7370e37cc57199a22458336d0c1f..0fb388b81ba854286665abaa686d38d07255a32f 100644
--- a/refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
+++ b/refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
@@ -1,102 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+ "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.realtime.dao.ibatis.RealtimeDataflowDaoImpl">
<!-- 瀛楁鍜屽睘鎬ф槧灏� -->
<resultMap type="RealtimeDataflowEntity" id="RealtimeDataflowEntity-Map">
- <id property="id" column="id" />
- <result property="siteId" column="siteId" />
- <result property="siteName" column="siteName" />
- <result property="personId" column="personId" />
- <result property="name" column="name" />
- <result property="device" column="device" />
- <result property="detectTime" column="detectTime" />
- <result property="contact" column="contact" />
- <result property="idNumber" column="idNumber" />
- <result property="isBooking" column="isBooking" />
- <result property="queueNum" column="queueNum" />
- <result property="location" column="location" />
- <result property="picture" column="picture" />
- <result property="createTime" column="createTime" />
- <result property="createUserId" column="createUserId" />
- <result property="updateTime" column="updateTime" />
- <result property="updateUserId" column="updateUserId" />
-
+ <id property="id" column="id" />
+ <result property="siteId" column="siteId" />
+ <result property="siteName" column="siteName" />
+ <result property="personId" column="personId" />
+ <result property="name" column="name" />
+ <result property="device" column="device" />
+ <result property="detectTime" column="detectTime" />
+ <result property="contact" column="contact" />
+ <result property="idNumber" column="idNumber" />
+ <result property="isBooking" column="isBooking" />
+ <result property="queueNum" column="queueNum" />
+ <result property="location" column="location" />
+ <result property="picture" column="picture" />
+ <result property="picUri" column="picUri" />
+ <result property="serverIndexCode" column="serverIndexCode" />
+ <result property="eventId" column="eventId" />
+ <result property="eventType" column="eventType" />
+ <result property="createTime" column="createTime" />
+ <result property="createUserId" column="createUserId" />
+ <result property="updateTime" column="updateTime" />
+ <result property="updateUserId" column="updateUserId" />
+
</resultMap>
<!-- 琛ㄦ墍鏈夊垪 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
- a.id,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
- a.siteId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
- a.siteName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('personId') or colPickMode == 1 and data.containsKey('personId')))">
- a.personId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
- a.name,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('device') or colPickMode == 1 and data.containsKey('device')))">
- a.device,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('detectTime') or colPickMode == 1 and data.containsKey('detectTime')))">
- a.detectTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contact') or colPickMode == 1 and data.containsKey('contact')))">
- a.contact,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idNumber') or colPickMode == 1 and data.containsKey('idNumber')))">
- a.idNumber,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBooking') or colPickMode == 1 and data.containsKey('isBooking')))">
- a.isBooking,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('queueNum') or colPickMode == 1 and data.containsKey('queueNum')))">
- a.queueNum,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('location') or colPickMode == 1 and data.containsKey('location')))">
- a.location,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picture') or colPickMode == 1 and data.containsKey('picture')))">
- a.picture,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
- a.createTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
- a.createUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
- a.updateTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
- a.updateUserId,
- </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+ a.id,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+ a.siteId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+ a.siteName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('personId') or colPickMode == 1 and data.containsKey('personId')))">
+ a.personId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+ a.name,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('device') or colPickMode == 1 and data.containsKey('device')))">
+ a.device,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('detectTime') or colPickMode == 1 and data.containsKey('detectTime')))">
+ a.detectTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contact') or colPickMode == 1 and data.containsKey('contact')))">
+ a.contact,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idNumber') or colPickMode == 1 and data.containsKey('idNumber')))">
+ a.idNumber,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBooking') or colPickMode == 1 and data.containsKey('isBooking')))">
+ a.isBooking,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('queueNum') or colPickMode == 1 and data.containsKey('queueNum')))">
+ a.queueNum,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('location') or colPickMode == 1 and data.containsKey('location')))">
+ a.location,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picture') or colPickMode == 1 and data.containsKey('picture')))">
+ a.picture,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUri') or colPickMode == 1 and data.containsKey('picUri')))">
+ a.picUri,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverIndexCode') or colPickMode == 1 and data.containsKey('serverIndexCode')))">
+ a.serverIndexCode,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventId') or colPickMode == 1 and data.containsKey('eventId')))">
+ a.eventId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventType') or colPickMode == 1 and data.containsKey('eventType')))">
+ a.eventType,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+ a.createTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+ a.createUserId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+ a.updateTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+ a.updateUserId,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="RealtimeDataflowEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_realtime_dataflow
- (siteId,siteName,personId,name,device,detectTime,contact,idNumber,isBooking,queueNum,location,picture,createTime,createUserId,updateTime,updateUserId)
+ (siteId,siteName,personId,name,device,detectTime,contact,idNumber,isBooking,queueNum,location,picture,picUri,serverIndexCode,eventId,eventType,createTime,createUserId,updateTime,updateUserId)
VALUES
- (#{siteId},#{siteName},#{personId},#{name},#{device},#{detectTime},#{contact},#{idNumber},#{isBooking},#{queueNum},#{location},#{picture},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+ (#{siteId},#{siteName},#{personId},#{name},#{device},#{detectTime},#{contact},#{idNumber},#{isBooking},#{queueNum},#{location},#{picture},#{picUri},#{serverIndexCode},#{eventId},#{eventType},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_realtime_dataflow
- (siteId,siteName,personId,name,device,detectTime,contact,idNumber,isBooking,queueNum,location,picture,createTime,createUserId,updateTime,updateUserId)
+ (siteId,siteName,personId,name,device,detectTime,contact,idNumber,isBooking,queueNum,location,picture,picUri,serverIndexCode,eventId,eventType,createTime,createUserId,updateTime,updateUserId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.siteId},#{item.siteName},#{item.personId},#{item.name},#{item.device},#{item.detectTime},#{item.contact},#{item.idNumber},#{item.isBooking},#{item.queueNum},#{item.location},#{item.picture},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+ (#{item.siteId},#{item.siteName},#{item.personId},#{item.name},#{item.device},#{item.detectTime},#{item.contact},#{item.idNumber},#{item.isBooking},#{item.queueNum},#{item.location},#{item.picture},#{item.picUri},#{item.serverIndexCode},#{item.eventId},#{item.eventType},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach>
</insert>
@@ -151,6 +167,21 @@
<if test="(colPickMode==0 and data.containsKey('picture')) or (colPickMode==1 and !data.containsKey('picture'))">
a.picture=#{data.picture},
</if>
+ <if test="(colPickMode==0 and data.containsKey('picUri')) or (colPickMode==1 and !data.containsKey('picUri'))">
+ a.picUri=#{data.picUri},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('serverIndexCode')) or (colPickMode==1 and !data.containsKey('serverIndexCode'))">
+ a.serverIndexCode=#{data.serverIndexCode},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('eventId')) or (colPickMode==1 and !data.containsKey('eventId'))">
+ a.eventId=#{data.eventId},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('eventType')) or (colPickMode==1 and !data.containsKey('eventType'))">
+ a.eventType=#{data.eventType},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('eventTypeIncrement')) or (colPickMode==1 and !data.containsKey('eventTypeIncrement'))">
+ a.eventType=ifnull(a.eventType,0) + #{data.eventTypeIncrement},
+ </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
@@ -181,143 +212,176 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_realtime_dataflow as a
<trim prefix="set" suffixOverrides=",">
- <trim prefix="siteId=(case" suffix="ELSE siteId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
- when a.id=#{item.id} then #{item.siteId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="siteName=(case" suffix="ELSE siteName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
- when a.id=#{item.id} then #{item.siteName}
- </if>
- </foreach>
- </trim>
- <trim prefix="personId=(case" suffix="ELSE personId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('personId')) or (colPickMode==1 and !item.containsKey('personId'))">
- when a.id=#{item.id} then #{item.personId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('personIdIncrement')) or (colPickMode==1 and !item.containsKey('personIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.personId,0) + #{item.personIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="name=(case" suffix="ELSE name end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
- when a.id=#{item.id} then #{item.name}
- </if>
- </foreach>
- </trim>
- <trim prefix="device=(case" suffix="ELSE device end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('device')) or (colPickMode==1 and !item.containsKey('device'))">
- when a.id=#{item.id} then #{item.device}
- </if>
- </foreach>
- </trim>
- <trim prefix="detectTime=(case" suffix="ELSE detectTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('detectTime')) or (colPickMode==1 and !item.containsKey('detectTime'))">
- when a.id=#{item.id} then #{item.detectTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="contact=(case" suffix="ELSE contact end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('contact')) or (colPickMode==1 and !item.containsKey('contact'))">
- when a.id=#{item.id} then #{item.contact}
- </if>
- </foreach>
- </trim>
- <trim prefix="idNumber=(case" suffix="ELSE idNumber end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('idNumber')) or (colPickMode==1 and !item.containsKey('idNumber'))">
- when a.id=#{item.id} then #{item.idNumber}
- </if>
- </foreach>
- </trim>
- <trim prefix="isBooking=(case" suffix="ELSE isBooking end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('isBooking')) or (colPickMode==1 and !item.containsKey('isBooking'))">
- when a.id=#{item.id} then #{item.isBooking}
- </when>
- <when test="(colPickMode==0 and item.containsKey('isBookingIncrement')) or (colPickMode==1 and !item.containsKey('isBookingIncrement'))">
- when a.id=#{item.id} then ifnull(a.isBooking,0) + #{item.isBookingIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="queueNum=(case" suffix="ELSE queueNum end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('queueNum')) or (colPickMode==1 and !item.containsKey('queueNum'))">
- when a.id=#{item.id} then #{item.queueNum}
- </if>
- </foreach>
- </trim>
- <trim prefix="location=(case" suffix="ELSE location end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('location')) or (colPickMode==1 and !item.containsKey('location'))">
- when a.id=#{item.id} then #{item.location}
- </if>
- </foreach>
- </trim>
- <trim prefix="picture=(case" suffix="ELSE picture end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('picture')) or (colPickMode==1 and !item.containsKey('picture'))">
- when a.id=#{item.id} then #{item.picture}
- </if>
- </foreach>
- </trim>
- <trim prefix="createTime=(case" suffix="ELSE createTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
- when a.id=#{item.id} then #{item.createTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
- when a.id=#{item.id} then #{item.createUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
- when a.id=#{item.id} then #{item.updateTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
- when a.id=#{item.id} then #{item.updateUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
+ <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+ when a.id=#{item.id} then #{item.siteId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+ when a.id=#{item.id} then #{item.siteName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="personId=(case" suffix="ELSE personId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('personId')) or (colPickMode==1 and !item.containsKey('personId'))">
+ when a.id=#{item.id} then #{item.personId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('personIdIncrement')) or (colPickMode==1 and !item.containsKey('personIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.personId,0) + #{item.personIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="name=(case" suffix="ELSE name end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+ when a.id=#{item.id} then #{item.name}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="device=(case" suffix="ELSE device end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('device')) or (colPickMode==1 and !item.containsKey('device'))">
+ when a.id=#{item.id} then #{item.device}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="detectTime=(case" suffix="ELSE detectTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('detectTime')) or (colPickMode==1 and !item.containsKey('detectTime'))">
+ when a.id=#{item.id} then #{item.detectTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="contact=(case" suffix="ELSE contact end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('contact')) or (colPickMode==1 and !item.containsKey('contact'))">
+ when a.id=#{item.id} then #{item.contact}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="idNumber=(case" suffix="ELSE idNumber end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('idNumber')) or (colPickMode==1 and !item.containsKey('idNumber'))">
+ when a.id=#{item.id} then #{item.idNumber}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="isBooking=(case" suffix="ELSE isBooking end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('isBooking')) or (colPickMode==1 and !item.containsKey('isBooking'))">
+ when a.id=#{item.id} then #{item.isBooking}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('isBookingIncrement')) or (colPickMode==1 and !item.containsKey('isBookingIncrement'))">
+ when a.id=#{item.id} then ifnull(a.isBooking,0) + #{item.isBookingIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="queueNum=(case" suffix="ELSE queueNum end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('queueNum')) or (colPickMode==1 and !item.containsKey('queueNum'))">
+ when a.id=#{item.id} then #{item.queueNum}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="location=(case" suffix="ELSE location end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('location')) or (colPickMode==1 and !item.containsKey('location'))">
+ when a.id=#{item.id} then #{item.location}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="picture=(case" suffix="ELSE picture end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('picture')) or (colPickMode==1 and !item.containsKey('picture'))">
+ when a.id=#{item.id} then #{item.picture}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="picUri=(case" suffix="ELSE picUri end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('picUri')) or (colPickMode==1 and !item.containsKey('picUri'))">
+ when a.id=#{item.id} then #{item.picUri}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="serverIndexCode=(case" suffix="ELSE serverIndexCode end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('serverIndexCode')) or (colPickMode==1 and !item.containsKey('serverIndexCode'))">
+ when a.id=#{item.id} then #{item.serverIndexCode}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="eventId=(case" suffix="ELSE eventId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('eventId')) or (colPickMode==1 and !item.containsKey('eventId'))">
+ when a.id=#{item.id} then #{item.eventId}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="eventType=(case" suffix="ELSE eventType end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('eventType')) or (colPickMode==1 and !item.containsKey('eventType'))">
+ when a.id=#{item.id} then #{item.eventType}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('eventTypeIncrement')) or (colPickMode==1 and !item.containsKey('eventTypeIncrement'))">
+ when a.id=#{item.id} then ifnull(a.eventType,0) + #{item.eventTypeIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+ when a.id=#{item.id} then #{item.createTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+ when a.id=#{item.id} then #{item.createUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+ when a.id=#{item.id} then #{item.updateTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+ when a.id=#{item.id} then #{item.updateUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -434,380 +498,470 @@
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
- <if test="conditionParamRef.containsKey('id')">
- <if test="conditionParamRef.id != null ">
- ${_conditionType_} a.id = #{${_conditionParam_}.id}
- </if>
- <if test="conditionParamRef.id == null">
- ${_conditionType_} a.id is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
- ${_conditionType_} a.id in
- <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
- ${_conditionType_} a.id not in
- <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
- ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ <if test="conditionParamRef.containsKey('id')">
+ <if test="conditionParamRef.id != null ">
+ ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
- <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
- ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ <if test="conditionParamRef.id == null">
+ ${_conditionType_} a.id is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+ ${_conditionType_} a.id in
+ <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+ ${_conditionType_} a.id not in
+ <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+ ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ </if>
+ <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+ ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ </if>
- <if test="conditionParamRef.containsKey('siteId')">
- <if test="conditionParamRef.siteId != null ">
- ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
- </if>
- <if test="conditionParamRef.siteId == null">
- ${_conditionType_} a.siteId is null
- </if>
+ <if test="conditionParamRef.containsKey('siteId')">
+ <if test="conditionParamRef.siteId != null ">
+ ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
- <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
- ${_conditionType_} a.siteId in
- <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
- ${_conditionType_} a.siteId not in
- <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
- ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
- </if>
- <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
- ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+ <if test="conditionParamRef.siteId == null">
+ ${_conditionType_} a.siteId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+ ${_conditionType_} a.siteId in
+ <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+ ${_conditionType_} a.siteId not in
+ <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+ ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+ ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('siteName')">
- <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
- ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
- </if>
- <if test="conditionParamRef.siteName == null">
- ${_conditionType_} a.siteName is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
- ${_conditionType_} a.siteName in
- <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
- ${_conditionType_} a.siteName not in
- <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('siteName')">
+ <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+ ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
</if>
- <if test="conditionParamRef.containsKey('personId')">
- <if test="conditionParamRef.personId != null ">
- ${_conditionType_} a.personId = #{${_conditionParam_}.personId}
- </if>
- <if test="conditionParamRef.personId == null">
- ${_conditionType_} a.personId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('personIdList') and conditionParamRef.personIdList.size() > 0">
- ${_conditionType_} a.personId in
- <foreach collection="conditionParamRef.personIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.siteName == null">
+ ${_conditionType_} a.siteName is null
</if>
- <if test="conditionParamRef.containsKey('personIdNotList') and conditionParamRef.personIdNotList.size() > 0">
- ${_conditionType_} a.personId not in
- <foreach collection="conditionParamRef.personIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('personIdStart') and conditionParamRef.personIdStart != null">
- ${_conditionType_} a.personId <![CDATA[ >= ]]> #{${_conditionParam_}.personIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+ ${_conditionType_} a.siteName in
+ <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+ ${_conditionType_} a.siteName not in
+ <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('personId')">
+ <if test="conditionParamRef.personId != null ">
+ ${_conditionType_} a.personId = #{${_conditionParam_}.personId}
</if>
- <if test="conditionParamRef.containsKey('personIdEnd') and conditionParamRef.personIdEnd != null">
- ${_conditionType_} a.personId <![CDATA[ <= ]]> #{${_conditionParam_}.personIdEnd}
+ <if test="conditionParamRef.personId == null">
+ ${_conditionType_} a.personId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('personIdList') and conditionParamRef.personIdList.size() > 0">
+ ${_conditionType_} a.personId in
+ <foreach collection="conditionParamRef.personIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('personIdNotList') and conditionParamRef.personIdNotList.size() > 0">
+ ${_conditionType_} a.personId not in
+ <foreach collection="conditionParamRef.personIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('personIdStart') and conditionParamRef.personIdStart != null">
+ ${_conditionType_} a.personId <![CDATA[ >= ]]> #{${_conditionParam_}.personIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('personIdEnd') and conditionParamRef.personIdEnd != null">
+ ${_conditionType_} a.personId <![CDATA[ <= ]]> #{${_conditionParam_}.personIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('name')">
- <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
- ${_conditionType_} a.name like #{${_conditionParam_}.name}
- </if>
- <if test="conditionParamRef.name == null">
- ${_conditionType_} a.name is null
- </if>
+ <if test="conditionParamRef.containsKey('name')">
+ <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+ ${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
- <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
- ${_conditionType_} a.name in
- <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
- ${_conditionType_} a.name not in
- <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.name == null">
+ ${_conditionType_} a.name is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
+ ${_conditionType_} a.name in
+ <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
+ ${_conditionType_} a.name not in
+ <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('device')">
- <if test="conditionParamRef.device != null and conditionParamRef.device != ''">
- ${_conditionType_} a.device like #{${_conditionParam_}.device}
- </if>
- <if test="conditionParamRef.device == null">
- ${_conditionType_} a.device is null
- </if>
+ <if test="conditionParamRef.containsKey('device')">
+ <if test="conditionParamRef.device != null and conditionParamRef.device != ''">
+ ${_conditionType_} a.device like #{${_conditionParam_}.device}
</if>
- <if test="conditionParamRef.containsKey('deviceList') and conditionParamRef.deviceList.size() > 0">
- ${_conditionType_} a.device in
- <foreach collection="conditionParamRef.deviceList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deviceNotList') and conditionParamRef.deviceNotList.size() > 0">
- ${_conditionType_} a.device not in
- <foreach collection="conditionParamRef.deviceNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.device == null">
+ ${_conditionType_} a.device is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('deviceList') and conditionParamRef.deviceList.size() > 0">
+ ${_conditionType_} a.device in
+ <foreach collection="conditionParamRef.deviceList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('deviceNotList') and conditionParamRef.deviceNotList.size() > 0">
+ ${_conditionType_} a.device not in
+ <foreach collection="conditionParamRef.deviceNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('detectTime')">
- <if test="conditionParamRef.detectTime != null ">
- ${_conditionType_} a.detectTime = #{${_conditionParam_}.detectTime}
- </if>
- <if test="conditionParamRef.detectTime == null">
- ${_conditionType_} a.detectTime is null
- </if>
+ <if test="conditionParamRef.containsKey('detectTime')">
+ <if test="conditionParamRef.detectTime != null ">
+ ${_conditionType_} a.detectTime = #{${_conditionParam_}.detectTime}
</if>
- <if test="conditionParamRef.containsKey('detectTimeStart') and conditionParamRef.detectTimeStart != null and conditionParamRef.detectTimeStart!=''">
- ${_conditionType_} a.detectTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.detectTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('detectTimeEnd') and conditionParamRef.detectTimeEnd != null and conditionParamRef.detectTimeEnd!=''">
- ${_conditionType_} a.detectTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.detectTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ <if test="conditionParamRef.detectTime == null">
+ ${_conditionType_} a.detectTime is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('detectTimeStart') and conditionParamRef.detectTimeStart != null and conditionParamRef.detectTimeStart!=''">
+ ${_conditionType_} a.detectTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.detectTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('detectTimeEnd') and conditionParamRef.detectTimeEnd != null and conditionParamRef.detectTimeEnd!=''">
+ ${_conditionType_} a.detectTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.detectTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
- <if test="conditionParamRef.containsKey('contact')">
- <if test="conditionParamRef.contact != null and conditionParamRef.contact != ''">
- ${_conditionType_} a.contact like #{${_conditionParam_}.contact}
- </if>
- <if test="conditionParamRef.contact == null">
- ${_conditionType_} a.contact is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('contactList') and conditionParamRef.contactList.size() > 0">
- ${_conditionType_} a.contact in
- <foreach collection="conditionParamRef.contactList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('contact')">
+ <if test="conditionParamRef.contact != null and conditionParamRef.contact != ''">
+ ${_conditionType_} a.contact like #{${_conditionParam_}.contact}
</if>
- <if test="conditionParamRef.containsKey('contactNotList') and conditionParamRef.contactNotList.size() > 0">
- ${_conditionType_} a.contact not in
- <foreach collection="conditionParamRef.contactNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.contact == null">
+ ${_conditionType_} a.contact is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('contactList') and conditionParamRef.contactList.size() > 0">
+ ${_conditionType_} a.contact in
+ <foreach collection="conditionParamRef.contactList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('contactNotList') and conditionParamRef.contactNotList.size() > 0">
+ ${_conditionType_} a.contact not in
+ <foreach collection="conditionParamRef.contactNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('idNumber')">
- <if test="conditionParamRef.idNumber != null and conditionParamRef.idNumber != ''">
- ${_conditionType_} a.idNumber like #{${_conditionParam_}.idNumber}
- </if>
- <if test="conditionParamRef.idNumber == null">
- ${_conditionType_} a.idNumber is null
- </if>
+ <if test="conditionParamRef.containsKey('idNumber')">
+ <if test="conditionParamRef.idNumber != null and conditionParamRef.idNumber != ''">
+ ${_conditionType_} a.idNumber like #{${_conditionParam_}.idNumber}
</if>
- <if test="conditionParamRef.containsKey('idNumberList') and conditionParamRef.idNumberList.size() > 0">
- ${_conditionType_} a.idNumber in
- <foreach collection="conditionParamRef.idNumberList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idNumberNotList') and conditionParamRef.idNumberNotList.size() > 0">
- ${_conditionType_} a.idNumber not in
- <foreach collection="conditionParamRef.idNumberNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.idNumber == null">
+ ${_conditionType_} a.idNumber is null
</if>
- <if test="conditionParamRef.containsKey('isBooking')">
- <if test="conditionParamRef.isBooking != null ">
- ${_conditionType_} a.isBooking = #{${_conditionParam_}.isBooking}
- </if>
- <if test="conditionParamRef.isBooking == null">
- ${_conditionType_} a.isBooking is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('isBookingList') and conditionParamRef.isBookingList.size() > 0">
- ${_conditionType_} a.isBooking in
- <foreach collection="conditionParamRef.isBookingList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('isBookingNotList') and conditionParamRef.isBookingNotList.size() > 0">
- ${_conditionType_} a.isBooking not in
- <foreach collection="conditionParamRef.isBookingNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('isBookingStart') and conditionParamRef.isBookingStart != null">
- ${_conditionType_} a.isBooking <![CDATA[ >= ]]> #{${_conditionParam_}.isBookingStart}
+ </if>
+ <if test="conditionParamRef.containsKey('idNumberList') and conditionParamRef.idNumberList.size() > 0">
+ ${_conditionType_} a.idNumber in
+ <foreach collection="conditionParamRef.idNumberList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idNumberNotList') and conditionParamRef.idNumberNotList.size() > 0">
+ ${_conditionType_} a.idNumber not in
+ <foreach collection="conditionParamRef.idNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('isBooking')">
+ <if test="conditionParamRef.isBooking != null ">
+ ${_conditionType_} a.isBooking = #{${_conditionParam_}.isBooking}
</if>
- <if test="conditionParamRef.containsKey('isBookingEnd') and conditionParamRef.isBookingEnd != null">
- ${_conditionType_} a.isBooking <![CDATA[ <= ]]> #{${_conditionParam_}.isBookingEnd}
+ <if test="conditionParamRef.isBooking == null">
+ ${_conditionType_} a.isBooking is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('isBookingList') and conditionParamRef.isBookingList.size() > 0">
+ ${_conditionType_} a.isBooking in
+ <foreach collection="conditionParamRef.isBookingList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('isBookingNotList') and conditionParamRef.isBookingNotList.size() > 0">
+ ${_conditionType_} a.isBooking not in
+ <foreach collection="conditionParamRef.isBookingNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('isBookingStart') and conditionParamRef.isBookingStart != null">
+ ${_conditionType_} a.isBooking <![CDATA[ >= ]]> #{${_conditionParam_}.isBookingStart}
+ </if>
+ <if test="conditionParamRef.containsKey('isBookingEnd') and conditionParamRef.isBookingEnd != null">
+ ${_conditionType_} a.isBooking <![CDATA[ <= ]]> #{${_conditionParam_}.isBookingEnd}
+ </if>
- <if test="conditionParamRef.containsKey('queueNum')">
- <if test="conditionParamRef.queueNum != null and conditionParamRef.queueNum != ''">
- ${_conditionType_} a.queueNum like #{${_conditionParam_}.queueNum}
- </if>
- <if test="conditionParamRef.queueNum == null">
- ${_conditionType_} a.queueNum is null
- </if>
+ <if test="conditionParamRef.containsKey('queueNum')">
+ <if test="conditionParamRef.queueNum != null and conditionParamRef.queueNum != ''">
+ ${_conditionType_} a.queueNum like #{${_conditionParam_}.queueNum}
</if>
- <if test="conditionParamRef.containsKey('queueNumList') and conditionParamRef.queueNumList.size() > 0">
- ${_conditionType_} a.queueNum in
- <foreach collection="conditionParamRef.queueNumList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('queueNumNotList') and conditionParamRef.queueNumNotList.size() > 0">
- ${_conditionType_} a.queueNum not in
- <foreach collection="conditionParamRef.queueNumNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.queueNum == null">
+ ${_conditionType_} a.queueNum is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('queueNumList') and conditionParamRef.queueNumList.size() > 0">
+ ${_conditionType_} a.queueNum in
+ <foreach collection="conditionParamRef.queueNumList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('queueNumNotList') and conditionParamRef.queueNumNotList.size() > 0">
+ ${_conditionType_} a.queueNum not in
+ <foreach collection="conditionParamRef.queueNumNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('location')">
- <if test="conditionParamRef.location != null and conditionParamRef.location != ''">
- ${_conditionType_} a.location like #{${_conditionParam_}.location}
- </if>
- <if test="conditionParamRef.location == null">
- ${_conditionType_} a.location is null
- </if>
+ <if test="conditionParamRef.containsKey('location')">
+ <if test="conditionParamRef.location != null and conditionParamRef.location != ''">
+ ${_conditionType_} a.location like #{${_conditionParam_}.location}
</if>
- <if test="conditionParamRef.containsKey('locationList') and conditionParamRef.locationList.size() > 0">
- ${_conditionType_} a.location in
- <foreach collection="conditionParamRef.locationList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('locationNotList') and conditionParamRef.locationNotList.size() > 0">
- ${_conditionType_} a.location not in
- <foreach collection="conditionParamRef.locationNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.location == null">
+ ${_conditionType_} a.location is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('locationList') and conditionParamRef.locationList.size() > 0">
+ ${_conditionType_} a.location in
+ <foreach collection="conditionParamRef.locationList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('locationNotList') and conditionParamRef.locationNotList.size() > 0">
+ ${_conditionType_} a.location not in
+ <foreach collection="conditionParamRef.locationNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('picture')">
- <if test="conditionParamRef.picture != null and conditionParamRef.picture != ''">
- ${_conditionType_} a.picture like #{${_conditionParam_}.picture}
- </if>
- <if test="conditionParamRef.picture == null">
- ${_conditionType_} a.picture is null
- </if>
+ <if test="conditionParamRef.containsKey('picture')">
+ <if test="conditionParamRef.picture != null and conditionParamRef.picture != ''">
+ ${_conditionType_} a.picture like #{${_conditionParam_}.picture}
</if>
- <if test="conditionParamRef.containsKey('pictureList') and conditionParamRef.pictureList.size() > 0">
- ${_conditionType_} a.picture in
- <foreach collection="conditionParamRef.pictureList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('pictureNotList') and conditionParamRef.pictureNotList.size() > 0">
- ${_conditionType_} a.picture not in
- <foreach collection="conditionParamRef.pictureNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.picture == null">
+ ${_conditionType_} a.picture is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('pictureList') and conditionParamRef.pictureList.size() > 0">
+ ${_conditionType_} a.picture in
+ <foreach collection="conditionParamRef.pictureList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('pictureNotList') and conditionParamRef.pictureNotList.size() > 0">
+ ${_conditionType_} a.picture not in
+ <foreach collection="conditionParamRef.pictureNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('createTime')">
- <if test="conditionParamRef.createTime != null ">
- ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
- </if>
- <if test="conditionParamRef.createTime == null">
- ${_conditionType_} a.createTime is null
- </if>
+ <if test="conditionParamRef.containsKey('picUri')">
+ <if test="conditionParamRef.picUri != null and conditionParamRef.picUri != ''">
+ ${_conditionType_} a.picUri like #{${_conditionParam_}.picUri}
</if>
- <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
- ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ <if test="conditionParamRef.picUri == null">
+ ${_conditionType_} a.picUri is null
</if>
- <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
- ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('picUriList') and conditionParamRef.picUriList.size() > 0">
+ ${_conditionType_} a.picUri in
+ <foreach collection="conditionParamRef.picUriList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('picUriNotList') and conditionParamRef.picUriNotList.size() > 0">
+ ${_conditionType_} a.picUri not in
+ <foreach collection="conditionParamRef.picUriNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('serverIndexCode')">
+ <if test="conditionParamRef.serverIndexCode != null and conditionParamRef.serverIndexCode != ''">
+ ${_conditionType_} a.serverIndexCode like #{${_conditionParam_}.serverIndexCode}
</if>
- <if test="conditionParamRef.containsKey('createUserId')">
- <if test="conditionParamRef.createUserId != null ">
- ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
- </if>
- <if test="conditionParamRef.createUserId == null">
- ${_conditionType_} a.createUserId is null
- </if>
+ <if test="conditionParamRef.serverIndexCode == null">
+ ${_conditionType_} a.serverIndexCode is null
</if>
- <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
- ${_conditionType_} a.createUserId in
- <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('serverIndexCodeList') and conditionParamRef.serverIndexCodeList.size() > 0">
+ ${_conditionType_} a.serverIndexCode in
+ <foreach collection="conditionParamRef.serverIndexCodeList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('serverIndexCodeNotList') and conditionParamRef.serverIndexCodeNotList.size() > 0">
+ ${_conditionType_} a.serverIndexCode not in
+ <foreach collection="conditionParamRef.serverIndexCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('eventId')">
+ <if test="conditionParamRef.eventId != null and conditionParamRef.eventId != ''">
+ ${_conditionType_} a.eventId like #{${_conditionParam_}.eventId}
</if>
- <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
- ${_conditionType_} a.createUserId not in
- <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.eventId == null">
+ ${_conditionType_} a.eventId is null
</if>
- <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
- ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('eventIdList') and conditionParamRef.eventIdList.size() > 0">
+ ${_conditionType_} a.eventId in
+ <foreach collection="conditionParamRef.eventIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('eventIdNotList') and conditionParamRef.eventIdNotList.size() > 0">
+ ${_conditionType_} a.eventId not in
+ <foreach collection="conditionParamRef.eventIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('eventType')">
+ <if test="conditionParamRef.eventType != null ">
+ ${_conditionType_} a.eventType = #{${_conditionParam_}.eventType}
</if>
- <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
- ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ <if test="conditionParamRef.eventType == null">
+ ${_conditionType_} a.eventType is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('eventTypeList') and conditionParamRef.eventTypeList.size() > 0">
+ ${_conditionType_} a.eventType in
+ <foreach collection="conditionParamRef.eventTypeList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('eventTypeNotList') and conditionParamRef.eventTypeNotList.size() > 0">
+ ${_conditionType_} a.eventType not in
+ <foreach collection="conditionParamRef.eventTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('eventTypeStart') and conditionParamRef.eventTypeStart != null">
+ ${_conditionType_} a.eventType <![CDATA[ >= ]]> #{${_conditionParam_}.eventTypeStart}
+ </if>
+ <if test="conditionParamRef.containsKey('eventTypeEnd') and conditionParamRef.eventTypeEnd != null">
+ ${_conditionType_} a.eventType <![CDATA[ <= ]]> #{${_conditionParam_}.eventTypeEnd}
+ </if>
- <if test="conditionParamRef.containsKey('updateTime')">
- <if test="conditionParamRef.updateTime != null ">
- ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
- </if>
- <if test="conditionParamRef.updateTime == null">
- ${_conditionType_} a.updateTime is null
- </if>
+ <if test="conditionParamRef.containsKey('createTime')">
+ <if test="conditionParamRef.createTime != null ">
+ ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
- <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
- ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ <if test="conditionParamRef.createTime == null">
+ ${_conditionType_} a.createTime is null
</if>
- <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
- ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+ ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+ ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createUserId')">
+ <if test="conditionParamRef.createUserId != null ">
+ ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
- <if test="conditionParamRef.containsKey('updateUserId')">
- <if test="conditionParamRef.updateUserId != null ">
- ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
- </if>
- <if test="conditionParamRef.updateUserId == null">
- ${_conditionType_} a.updateUserId is null
- </if>
+ <if test="conditionParamRef.createUserId == null">
+ ${_conditionType_} a.createUserId is null
</if>
- <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
- ${_conditionType_} a.updateUserId in
- <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+ ${_conditionType_} a.createUserId in
+ <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+ ${_conditionType_} a.createUserId not in
+ <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+ ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+ ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ </if>
+
+
+ <if test="conditionParamRef.containsKey('updateTime')">
+ <if test="conditionParamRef.updateTime != null ">
+ ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
- <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
- ${_conditionType_} a.updateUserId not in
- <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.updateTime == null">
+ ${_conditionType_} a.updateTime is null
</if>
- <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
- ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserId')">
+ <if test="conditionParamRef.updateUserId != null ">
+ ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
- <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
- ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+ <if test="conditionParamRef.updateUserId == null">
+ ${_conditionType_} a.updateUserId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+ ${_conditionType_} a.updateUserId in
+ <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+ ${_conditionType_} a.updateUserId not in
+ <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+ </if>
</sql>
<sql id="_orderCols_">
@@ -815,98 +969,118 @@
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
- ${item.colName} ${item.sortKind}
+ ${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
- <if test="orderCol.containsKey('id')">
- a.id
- <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('siteId')">
- a.siteId
- <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('siteName')">
- a.siteName
- <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('personId')">
- a.personId
- <if test='orderCol.personId != null and "DESC".equalsIgnoreCase(orderCol.personId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('name')">
- a.name
- <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('device')">
- a.device
- <if test='orderCol.device != null and "DESC".equalsIgnoreCase(orderCol.device)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('detectTime')">
- a.detectTime
- <if test='orderCol.detectTime != null and "DESC".equalsIgnoreCase(orderCol.detectTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('contact')">
- a.contact
- <if test='orderCol.contact != null and "DESC".equalsIgnoreCase(orderCol.contact)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('idNumber')">
- a.idNumber
- <if test='orderCol.idNumber != null and "DESC".equalsIgnoreCase(orderCol.idNumber)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('isBooking')">
- a.isBooking
- <if test='orderCol.isBooking != null and "DESC".equalsIgnoreCase(orderCol.isBooking)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('queueNum')">
- a.queueNum
- <if test='orderCol.queueNum != null and "DESC".equalsIgnoreCase(orderCol.queueNum)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('location')">
- a.location
- <if test='orderCol.location != null and "DESC".equalsIgnoreCase(orderCol.location)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('picture')">
- a.picture
- <if test='orderCol.picture != null and "DESC".equalsIgnoreCase(orderCol.picture)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createTime')">
- a.createTime
- <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createUserId')">
- a.createUserId
- <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateTime')">
- a.updateTime
- <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateUserId')">
- a.updateUserId
- <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
- ,
- </if>
+ <if test="orderCol.containsKey('id')">
+ a.id
+ <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('siteId')">
+ a.siteId
+ <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('siteName')">
+ a.siteName
+ <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('personId')">
+ a.personId
+ <if test='orderCol.personId != null and "DESC".equalsIgnoreCase(orderCol.personId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('name')">
+ a.name
+ <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('device')">
+ a.device
+ <if test='orderCol.device != null and "DESC".equalsIgnoreCase(orderCol.device)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('detectTime')">
+ a.detectTime
+ <if test='orderCol.detectTime != null and "DESC".equalsIgnoreCase(orderCol.detectTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('contact')">
+ a.contact
+ <if test='orderCol.contact != null and "DESC".equalsIgnoreCase(orderCol.contact)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('idNumber')">
+ a.idNumber
+ <if test='orderCol.idNumber != null and "DESC".equalsIgnoreCase(orderCol.idNumber)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('isBooking')">
+ a.isBooking
+ <if test='orderCol.isBooking != null and "DESC".equalsIgnoreCase(orderCol.isBooking)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('queueNum')">
+ a.queueNum
+ <if test='orderCol.queueNum != null and "DESC".equalsIgnoreCase(orderCol.queueNum)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('location')">
+ a.location
+ <if test='orderCol.location != null and "DESC".equalsIgnoreCase(orderCol.location)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('picture')">
+ a.picture
+ <if test='orderCol.picture != null and "DESC".equalsIgnoreCase(orderCol.picture)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('picUri')">
+ a.picUri
+ <if test='orderCol.picUri != null and "DESC".equalsIgnoreCase(orderCol.picUri)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('serverIndexCode')">
+ a.serverIndexCode
+ <if test='orderCol.serverIndexCode != null and "DESC".equalsIgnoreCase(orderCol.serverIndexCode)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('eventId')">
+ a.eventId
+ <if test='orderCol.eventId != null and "DESC".equalsIgnoreCase(orderCol.eventId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('eventType')">
+ a.eventType
+ <if test='orderCol.eventType != null and "DESC".equalsIgnoreCase(orderCol.eventType)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createTime')">
+ a.createTime
+ <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createUserId')">
+ a.createUserId
+ <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateTime')">
+ a.updateTime
+ <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateUserId')">
+ a.updateUserId
+ <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>