update

src/main/java/com/zhiqiyun/open/core/mapper/statistics/HyMonitorConsumeMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorConsume;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HyMonitorConsumeMapper extends BaseMapper<HyMonitorConsume> {
+}

src/main/java/com/zhiqiyun/open/core/models/statistics/HyMonitorConsume.java

@@ -0,0 +1,53 @@
+package com.zhiqiyun.open.core.models.statistics;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("hy_monitor_consume")
+public class HyMonitorConsume {
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private Long authId;
+
+	private Long mechanismId;
+
+	private Long userId;
+
+	private String sourceArea;
+
+	private BigDecimal money;
+
+	private Integer gender;
+
+	private Integer age;
+
+	private Integer ageSection;
+
+	/**
+	 * 创建者
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long creator;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createDate;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	private Integer isDeleted;
+}
+

src/main/java/com/zhiqiyun/open/core/service/HyMonitorConsumeService.java

@@ -0,0 +1,8 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorConsume;
+import com.zhiqiyun.open.core.models.statistics.TravelScenicAudit;
+
+public interface HyMonitorConsumeService extends IService<HyMonitorConsume> {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/HyMonitorConsumeServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.statistics.HyMonitorConsumeMapper;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorConsume;
+import com.zhiqiyun.open.core.service.HyMonitorConsumeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HyMonitorConsumeServiceImpl extends ServiceImpl<HyMonitorConsumeMapper, HyMonitorConsume> implements HyMonitorConsumeService {
+}

src/main/java/com/zhiqiyun/open/router/apis/MonitorApi.java

@@ -4,8 +4,11 @@ import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
 import com.zhiqiyun.open.core.models.statistics.HyMonitor;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorConsume;
+import com.zhiqiyun.open.core.service.HyMonitorConsumeService;
 import com.zhiqiyun.open.core.service.HyMonitorService;
 import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.router.request.statistics.SaveHyMonitorConsumeRequest;
 import com.zhiqiyun.open.router.request.statistics.SaveHyMonitorRequest;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +23,9 @@ public class MonitorApi {
 	private HyMonitorService hyMonitorService;
 
 	@Autowired
+	private HyMonitorConsumeService hyMonitorConsumeService;
+
+	@Autowired
 	private SequenceService sequenceService;
 
 	@ServiceMethod(method = "hy.monitor.add", title = "各机构客流量提交")
@@ -35,4 +41,18 @@ public class MonitorApi {
 
 		return OapResponse.success().setBody(entity);
 	}
+
+	@ServiceMethod(method = "hy.monitor.consume.add", title = "各机构消费明细提交")
+	public OapResponse save(SaveHyMonitorConsumeRequest request) {
+
+		HyMonitorConsume entity = new HyMonitorConsume();
+		BeanUtils.copyProperties(request, entity);
+
+		entity.setCreateDate(DateUtil.current());
+		entity.setId(this.sequenceService.nextId());
+
+		this.hyMonitorConsumeService.save(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
 }

src/main/java/com/zhiqiyun/open/router/request/statistics/SaveHyMonitorConsumeRequest.java

@@ -0,0 +1,52 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SaveHyMonitorConsumeRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	@ServiceParamField(describe = "消费场所")
+	private Long mechanismId;
+
+	@ServiceParamField(describe = "消费用户")
+	private Long userId;
+
+	@ServiceParamField(describe = "来源地区")
+	private String sourceArea;
+
+	@ServiceParamField(describe = "消费金额")
+	private BigDecimal money;
+
+	@ServiceParamField(describe = "性别 1、男 2、女")
+	private Integer gender;
+
+	@ServiceParamField(describe = "年龄")
+	private Integer age;
+
+	@ServiceParamField(describe = "1、0-17岁 2、18-22岁 3、23-26岁 4、26岁以上")
+	private Integer ageSection;
+
+	/**
+	 * 创建者
+	 */
+	@ServiceParamField(describe = "创建者")
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+}

src/main/resources/db/migration/V1.2.0__travel_scenic_audit.sql

@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS `travel_scenic_audit`;
 CREATE TABLE `travel_scenic_audit`
 (
-    `id`            bigint(20) NOT NULL AUTO_INCREMENT,
+    `id`            bigint(20) NOT NULL,
     `auth_id`       bigint(20) NULL DEFAULT NULL,
     `creator`       bigint(20) NULL DEFAULT NULL,
     `create_date`   datetime NULL DEFAULT NULL COMMENT '创建日期',

src/main/resources/db/migration/V1.2.1__hy_monitor.sql

@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS `hy_monitor`;
 CREATE TABLE `hy_monitor`
 (
-    `id`             bigint(20) NOT NULL AUTO_INCREMENT,
+    `id`             bigint(20) NOT NULL,
     `auth_id`        bigint(20) NULL DEFAULT NULL,
     `mechanism_id`   bigint(20) NULL DEFAULT NULL COMMENT '机构ID',
     `type`           tinyint(2) NULL DEFAULT NULL COMMENT '监测类型 1.客流量监测 ',

src/main/resources/db/migration/V1.2.1__hy_monitor_consume.sql

@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS `hy_monitor_consume`;
+CREATE TABLE `hy_monitor_consume`
+(
+    `id`           bigint(20) NOT NULL,
+    `auth_id`      bigint(20) NULL DEFAULT NULL,
+    `mechanism_id` bigint(20) NULL DEFAULT NULL COMMENT '消费场所',
+    `user_id`      bigint(255) NULL DEFAULT NULL COMMENT '消费用户',
+    `source_area`  varchar(100) NULL DEFAULT NULL COMMENT '来源地区',
+    `money`        decimal(11, 2) NULL DEFAULT NULL COMMENT '消费金额',
+    `gender`       tinyint(4) NULL DEFAULT 1 COMMENT '性别 1、男 2、女',
+    `age`          int(11) NULL DEFAULT 0 COMMENT '年龄',
+    `age_section`  tinyint(4) NULL DEFAULT 1 COMMENT '1、0-17岁 2、18-22岁 3、23-26岁 4、26岁以上',
+    `creator`      bigint(20) NULL DEFAULT NULL COMMENT '创建者',
+    `create_date`  datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `is_deleted`   tinyint(4) NULL DEFAULT 0 COMMENT '是否已删除 0 否 1 是',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX          `idx_authid_isdeleted_userid_sourcearea`(`auth_id`, `is_deleted`, `user_id`, `source_area`) USING BTREE,
+    INDEX          `idx_authid_isdeleted_money`(`auth_id`, `is_deleted`, `money`) USING BTREE,
+    INDEX          `idx_authid_isdeleted_createdate`(`auth_id`, `is_deleted`, `create_date`) USING BTREE,
+    INDEX          `idx_isdeleted_createdate`(`is_deleted`, `create_date`) USING BTREE,
+    INDEX          `idx_authid_isdeleted_userid_agesection`(`auth_id`, `is_deleted`, `user_id`, `age_section`) USING BTREE,
+    INDEX          `create_date`(`create_date`) USING BTREE
+) ENGINE=InnoDB COMMENT='文旅行业-产业监测系统-用户消费数据';