update

README.md

@@ -0,0 +1,29 @@
+```
+DELETE FROM dict_city WHERE grade=5;
+DELETE FROM dict_city WHERE full_name='市辖区' AND children_num =1
+SELECT * FROM dict_city WHERE full_name='市辖区' AND children_num >0
+
+DELETE FROM `dict_city` WHERE  `id`='1101';
+UPDATE dict_city SET parent_id='11',grade=2 WHERE parent_id='1101';
+UPDATE dict_city SET grade=3 WHERE id LIKE '1101%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='1201';
+UPDATE dict_city SET parent_id='12',grade=2 WHERE parent_id='1201';
+UPDATE dict_city SET grade=3 WHERE id LIKE '1201%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='3101';
+UPDATE dict_city SET parent_id='31',grade=2 WHERE parent_id='3101';
+UPDATE dict_city SET grade=3 WHERE id LIKE '3101%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='5001';
+UPDATE dict_city SET parent_id='50',grade=2 WHERE parent_id='5001';
+UPDATE dict_city SET grade=3 WHERE id LIKE '5001%' AND grade=4;
+
+
+DELETE FROM `dict_city` WHERE  `id`='620201';
+UPDATE dict_city SET parent_id='6202',grade=3 WHERE parent_id='620201';
+
+```

src/main/java/com/zhiqiyun/open/core/models/equipment/EquipmentPassengerPeople.java

@@ -9,12 +9,11 @@ import java.util.Date;
 @Data
 @TableName("equipment_passenger_people")
 public class EquipmentPassengerPeople {
-	private Long id;
-	private Long equipmentId;
-	private String faceId;
-	private Gender gender;
-	private String fromSource;
-	private Date inTime;
-	private Date outTime;
-	private Integer retentionTime;
+    private Long id;
+    private Long placeBaseInfoId;
+    private Long equipmentId;
+    private String faceId;
+    private Date createdTime;
+    private Gender gender;
+    private String fromSource;
 }

src/main/resources/db/migration/V1.0.4__passenger_equipment.sql

@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS `equipment_passenger`;
 CREATE TABLE `equipment_passenger`
 (
     `id`                 BIGINT(20) NOT NULL COMMENT 'ID',
-    `place_base_info_id` BIGINT(20) NULL DEFAULT NULL COMMENT '点位类型',
+    `place_base_info_id` BIGINT(20) NULL DEFAULT NULL COMMENT '点位ID',
     `brief`              VARCHAR(500) NULL DEFAULT NULL COMMENT '说明',
     `litpics`            VARCHAR(500) NULL DEFAULT NULL COMMENT '图片',
     `lng`                DECIMAL(20, 12) NOT NULL DEFAULT '0.000000000000' COMMENT '经度（坐标）',
@@ -19,14 +19,13 @@ CREATE TABLE `equipment_passenger`
 DROP TABLE IF EXISTS `equipment_passenger_people`;
 CREATE TABLE `equipment_passenger_people`
 (
-    `id`             BIGINT(20) NOT NULL COMMENT 'ID',
-    `equipment_id`   BIGINT(20) NULL DEFAULT NULL COMMENT '设备ID',
-    `face_id`        VARCHAR(32) NULL DEFAULT NULL COMMENT '面容ID',
-    `in_time`        DATETIME NULL DEFAULT NULL COMMENT '进入时间',
-    `out_time`       DATETIME NULL DEFAULT NULL COMMENT '离开时间',
-    `gender`         INT(1) NULL DEFAULT NULL COMMENT '性别',
-    `from_source`    VARCHAR(32) NULL DEFAULT NULL COMMENT '来源地区',
-    `retention_time` INT(11) NULL DEFAULT NULL COMMENT '停留时间',
+    `id`                 BIGINT(20) NOT NULL COMMENT 'ID',
+    `place_base_info_id` BIGINT(20) NULL DEFAULT NULL COMMENT '点位ID',
+    `equipment_id`       BIGINT(20) NULL DEFAULT NULL COMMENT '设备ID',
+    `face_id`            VARCHAR(32) NULL DEFAULT NULL COMMENT '面容ID',
+    `created_time`       DATETIME NULL DEFAULT NULL COMMENT '创建时间',
+    `gender`             INT(1) NULL DEFAULT NULL COMMENT '性别',
+    `from_source`        VARCHAR(32) NULL DEFAULT NULL COMMENT '来源地区',
     PRIMARY KEY (`id`)
 ) COMMENT ='人流监测详细数据信息' ENGINE = InnoDB;