Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev

jz-dm-common/src/main/java/com/jz/common/bean/BaseBeanResponse.java

+package com.jz.common.bean;
+
+import java.util.List;
+
+/**
+ * @author ybz
+ *
+ */
+public class BaseBeanResponse<T> extends BaseResponse {
+	
+	private T data;
+	
+	private List<T> datas;
+	
+	public BaseBeanResponse(){
+		super();
+	}
+	
+	public BaseBeanResponse(String code, T data) {
+		super(code);
+		this.data = data;
+	}
+	
+	public BaseBeanResponse(String code, List<T> datas) {
+		super(code);
+		this.datas = datas;
+	}
+	
+	public BaseBeanResponse(String code, String message, T data) {
+		super(code, message);
+		this.data = data;
+	}
+	
+	public BaseBeanResponse(String code, String message, List<T> datas) {
+		super(code, message);
+		this.datas = datas;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+	public List<T> getDatas() {
+		return datas;
+	}
+
+	public void setDatas(List<T> datas) {
+		this.datas = datas;
+	}
+	
+}

jz-dm-common/src/main/java/com/jz/common/bean/BasePageBean.java

+package com.jz.common.bean;
+
+/**分页信息封装
+ * @author ybz
+ *
+ */
+public class BasePageBean {
+	
+	private int pageNum = 1;
+	
+	private int pageSize = 10;
+
+	public int getPageNum() {
+		return pageNum;
+	}
+
+	public void setPageNum(int pageNum) {
+		this.pageNum = pageNum;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	
+	
+
+}

jz-dm-common/src/main/java/com/jz/common/bean/BaseResponse.java

+package com.jz.common.bean;
+
+/**
+ * @author ybz
+ *
+ */
+public class BaseResponse {
+	//错误码
+	private String code;
+	//错误消息
+	private String message;
+	
+	public BaseResponse() {}
+	
+	public BaseResponse(String code) {
+		this.code = code;
+	}
+	
+	public BaseResponse(String code, String message) {
+		this.code = code;
+		this.message = message;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	
+}

jz-dm-common/src/main/java/com/jz/common/bean/PageInfoResponse.java

+package com.jz.common.bean;
+
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @author ybz
+ *
+ */
+public class PageInfoResponse<T> extends BaseResponse {
+	
+	private PageInfo<T> data;
+
+	public PageInfo<T> getData() {
+		return data;
+	}
+
+	public void setData(PageInfo<T> data) {
+		this.data = data;
+	}
+
+}

jz-dm-common/src/main/java/com/jz/common/constant/Constants.java

+package com.jz.common.constant;
+
+/**常量
+ * @author ybz
+ *
+ */
+public class Constants {
+	
+	public final static String SUCCESS_CODE = "200";
+	
+	public final static String FAILURE_CODE = "201";
+	
+	/*****************************************************************************/
+	//第三方请求返回结果码定义
+	public static String CODE_SUCCESS = "000";
+	public static String MSG_SUCCESS = "操作成功";
+	
+	public static String CODE_ERROR_REQUESTMETHOD = "100";
+	public static String MSG_ERROR_REQUESTMETHOD = "请求方式错误(只支持POST方式请求)";
+	
+	public static String CODE_ERROR_PARAMETER = "101";
+	public static String MSG_ERROR_PARAMETER = "参数不正确(格式不正确或必填参数为空)";
+	
+	public static String CODE_ERROR_CITYCODE = "102";
+	public static String MSG_ERROR_CITYCODE = "城市区域代码错误";
+	
+	public static String CODE_NOT_SIGNED = "103";
+	public static String MSG_NOT_SIGNED = "尚未登录或者登录已过期";
+	
+	public static String CODE_DATA_EXISTED = "106";
+	public static String MSG_DATA_EXISTED = "企业已备案，请勿重复备案";
+	
+	public static String CODE_ERROR_USERNAMEORPASSWD = "107";
+	public static String MSG_ERROR_USERNAMEORPASSWD = "用户名或密码错误";
+	
+	public static String CODE_USER_LOGGEDOFF = "108";
+	public static String MSG_USER_LOGGEDOFF = "用户已注销";
+	
+	public static String CODE_DATA_NOTMEET = "201";
+	public static String MSG_DATA_NOTMEET = "数据不符合业务处理要求";
+	
+	public static String CODE_SYS_EXCEPTION = "500";
+	public static String MSG_SYS_EXCEPTION = "系统异常，请联系接口提供方";
+	
+	/*****************************************************************************/
+
+}

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysMenu.java → jz-dm-common/src/main/java/com/jz/common/entity/SysMenu.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysOrg.java → jz-dm-common/src/main/java/com/jz/common/entity/SysOrg.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysRole.java → jz-dm-common/src/main/java/com/jz/common/entity/SysRole.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysRoleMenu.java → jz-dm-common/src/main/java/com/jz/common/entity/SysRoleMenu.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysUser.java → jz-dm-common/src/main/java/com/jz/common/entity/SysUser.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-common/src/main/java/com/jz/common/entity/sys/SysUserRole.java → jz-dm-common/src/main/java/com/jz/common/entity/SysUserRole.java

-package com.jz.common.entity.sys;
+package com.jz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/goods/bean/dto/DataGoodsDto.java

+package com.jz.manage.moduls.controller.goods.bean.dto;
+
+import com.jz.common.entity.DataGoods;
+
+public class DataGoodsDto extends DataGoods {
+
+}

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/goods/bean/request/DataGoodsRequest.java

+package com.jz.manage.moduls.controller.goods.bean.request;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.jz.common.bean.BasePageBean;
+
+/**数据商品参数请求封装
+ * @author ybz
+ *
+ */
+public class DataGoodsRequest extends BasePageBean {
+	/**
+	* 数据商品id
+	*/
+	private Long dataGoodsId;
+
+	/**
+	* 商品分类id（行业）
+	*/
+	private Long categoryId;
+
+	/**
+	* 数据商户id
+	*/
+	private Long userId;
+
+	/**
+	* 数据商品名称
+	*/
+	private String dataName;
+
+	/**
+	* 数据类型：01api，02数据包
+	*/
+	private String dataType;
+
+	/**
+	* 数据商品标签
+	*/
+	private String dataLabel;
+
+	/**
+	* 数据商品图片
+	*/
+	private String dataPicture;
+
+	/**
+	* 数据商品价格
+	*/
+	private BigDecimal dataPrice;
+
+	/**
+	* 优惠价格
+	*/
+	private BigDecimal discountPrice;
+
+	/**
+	* 价格类型：01免费，02收费
+	*/
+	private String priceType;
+
+	/**
+	* 商品规格
+	*/
+	private String goodsStandards;
+
+	/**
+	* 数据状态：01预售，02在售中，03下架，04上架
+	*/
+	private String dataStatus;
+
+	/**
+	* 审核状态：01待审核，02已审核，03未通过
+	*/
+	private String auditStatus;
+
+	/**
+	* 清洗规则（脱敏校验）
+	*/
+	private String cleanRule;
+
+	/**
+	* 驳回原因
+	*/
+	private String rejectReason;
+
+	/**
+	* 审核人
+	*/
+	private String auditPerson;
+
+	/**
+	* 审核时间起
+	*/
+	private Date auditTimeStart;
+
+	/**
+	* 审核时间止
+	*/
+	private Date auditTimeEnd;
+
+	/**
+	* 创建时间起
+	*/
+	private Date creTimeStart;
+
+	/**
+	* 创建时间止
+	*/
+	private Date creTimeEnd;
+
+	/**
+	* 创建人
+	*/
+	private String crePerson;
+
+	/**
+	* 更新时间起
+	*/
+	private Date uptTimeStart;
+
+	/**
+	* 更新时间止
+	*/
+	private Date uptTimeEnd;
+
+	/**
+	* 更新人
+	*/
+	private String uptPerson;
+
+	/**
+	* 删除标识
+	*/
+	private String delFlag;
+
+	/**
+	* 年（元）
+	*/
+	private BigDecimal yearType;
+
+	/**
+	* 季（元）
+	*/
+	private BigDecimal seasonType;
+
+	/**
+	* 月（元）
+	*/
+	private BigDecimal monthType;
+
+	/**
+	* 次（元）
+	*/
+	private BigDecimal secondType;
+
+	public Long getDataGoodsId() {
+		return dataGoodsId;
+	}
+
+	public void setDataGoodsId(Long dataGoodsId) {
+		this.dataGoodsId = dataGoodsId;
+	}
+
+	public Long getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(Long categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getDataName() {
+		return dataName;
+	}
+
+	public void setDataName(String dataName) {
+		this.dataName = dataName;
+	}
+
+	public String getDataType() {
+		return dataType;
+	}
+
+	public void setDataType(String dataType) {
+		this.dataType = dataType;
+	}
+
+	public String getDataLabel() {
+		return dataLabel;
+	}
+
+	public void setDataLabel(String dataLabel) {
+		this.dataLabel = dataLabel;
+	}
+
+	public String getDataPicture() {
+		return dataPicture;
+	}
+
+	public void setDataPicture(String dataPicture) {
+		this.dataPicture = dataPicture;
+	}
+
+	public BigDecimal getDataPrice() {
+		return dataPrice;
+	}
+
+	public void setDataPrice(BigDecimal dataPrice) {
+		this.dataPrice = dataPrice;
+	}
+
+	public BigDecimal getDiscountPrice() {
+		return discountPrice;
+	}
+
+	public void setDiscountPrice(BigDecimal discountPrice) {
+		this.discountPrice = discountPrice;
+	}
+
+	public String getPriceType() {
+		return priceType;
+	}
+
+	public void setPriceType(String priceType) {
+		this.priceType = priceType;
+	}
+
+	public String getGoodsStandards() {
+		return goodsStandards;
+	}
+
+	public void setGoodsStandards(String goodsStandards) {
+		this.goodsStandards = goodsStandards;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public String getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(String auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
+	public String getCleanRule() {
+		return cleanRule;
+	}
+
+	public void setCleanRule(String cleanRule) {
+		this.cleanRule = cleanRule;
+	}
+
+	public String getRejectReason() {
+		return rejectReason;
+	}
+
+	public void setRejectReason(String rejectReason) {
+		this.rejectReason = rejectReason;
+	}
+
+	public String getAuditPerson() {
+		return auditPerson;
+	}
+
+	public void setAuditPerson(String auditPerson) {
+		this.auditPerson = auditPerson;
+	}
+
+	public Date getAuditTimeStart() {
+		return auditTimeStart;
+	}
+
+	public void setAuditTimeStart(Date auditTimeStart) {
+		this.auditTimeStart = auditTimeStart;
+	}
+
+	public Date getAuditTimeEnd() {
+		return auditTimeEnd;
+	}
+
+	public void setAuditTimeEnd(Date auditTimeEnd) {
+		this.auditTimeEnd = auditTimeEnd;
+	}
+
+	public Date getCreTimeStart() {
+		return creTimeStart;
+	}
+
+	public void setCreTimeStart(Date creTimeStart) {
+		this.creTimeStart = creTimeStart;
+	}
+
+	public Date getCreTimeEnd() {
+		return creTimeEnd;
+	}
+
+	public void setCreTimeEnd(Date creTimeEnd) {
+		this.creTimeEnd = creTimeEnd;
+	}
+
+	public String getCrePerson() {
+		return crePerson;
+	}
+
+	public void setCrePerson(String crePerson) {
+		this.crePerson = crePerson;
+	}
+
+	public Date getUptTimeStart() {
+		return uptTimeStart;
+	}
+
+	public void setUptTimeStart(Date uptTimeStart) {
+		this.uptTimeStart = uptTimeStart;
+	}
+
+	public Date getUptTimeEnd() {
+		return uptTimeEnd;
+	}
+
+	public void setUptTimeEnd(Date uptTimeEnd) {
+		this.uptTimeEnd = uptTimeEnd;
+	}
+
+	public String getUptPerson() {
+		return uptPerson;
+	}
+
+	public void setUptPerson(String uptPerson) {
+		this.uptPerson = uptPerson;
+	}
+
+	public String getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+
+	public BigDecimal getYearType() {
+		return yearType;
+	}
+
+	public void setYearType(BigDecimal yearType) {
+		this.yearType = yearType;
+	}
+
+	public BigDecimal getSeasonType() {
+		return seasonType;
+	}
+
+	public void setSeasonType(BigDecimal seasonType) {
+		this.seasonType = seasonType;
+	}
+
+	public BigDecimal getMonthType() {
+		return monthType;
+	}
+
+	public void setMonthType(BigDecimal monthType) {
+		this.monthType = monthType;
+	}
+
+	public BigDecimal getSecondType() {
+		return secondType;
+	}
+
+	public void setSecondType(BigDecimal secondType) {
+		this.secondType = secondType;
+	}
+}

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/sys/LoginController.java

 package com.jz.manage.moduls.controller.sys;
 
-import com.jz.common.entity.sys.SysUser;
+import com.jz.common.entity.SysUser;
 import com.jz.common.utils.Result;
 import com.jz.common.utils.StatusCode;
 import com.jz.manage.moduls.controller.BaseController;
 import com.jz.manage.moduls.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/sys")
@@ -36,6 +34,18 @@ public class LoginController extends BaseController {
         return new Result<>(false, "用户名或密码错误！", StatusCode.ERROR);
     }
 
+//    /**
+//     * 手机号码校验
+//     * @param paramMap
+//     * @param res
+//     * @return
+//     */
+//    @PostMapping(value = "/check")
+//    public Result loginCheck(@RequestBody Map<String, String> paramMap, HttpServletResponse res) {
+//        // 获取手机号码
+//        String telephone = paramMap.get("telephone");
+//
+//    }
     /*@ApiOperation("登录接口")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public Result<JSONObject> login(@RequestBody SysUser sysUser, HttpServletRequest request) throws Exception {

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/AuditRecord.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 审核记录(TAuditRecord)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:29
+ */
+@TableName("t_audit_record")
+@ApiModel
+public class AuditRecord implements Serializable {
+    private static final long serialVersionUID = 747782852655865930L;
+    /**
+     * 主键
+     */
+    private Long auditRecord;
+    /**
+     * 实例id
+     */
+    private String exampleId;
+    /**
+     * 驳回原因
+     */
+    private String rejectReason;
+    /**
+     * 审核类型：01企业审核，02数据审核，03需求审核
+     */
+    private String auditType;
+    /**
+     * 创建人
+     */
+    private String creTime;
+    /**
+     * 创建时间
+     */
+    private Date crePerson;
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+
+    public Long getAuditRecord() {
+        return auditRecord;
+    }
+
+    public void setAuditRecord(Long auditRecord) {
+        this.auditRecord = auditRecord;
+    }
+
+    public String getExampleId() {
+        return exampleId;
+    }
+
+    public void setExampleId(String exampleId) {
+        this.exampleId = exampleId;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getAuditType() {
+        return auditType;
+    }
+
+    public void setAuditType(String auditType) {
+        this.auditType = auditType;
+    }
+
+    public String getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(String creTime) {
+        this.creTime = creTime;
+    }
+
+    public Date getCrePerson() {
+        return crePerson;
+    }
+
+    public void setCrePerson(Date crePerson) {
+        this.crePerson = crePerson;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DataGoods.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据商品(TDataGoods)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:30
+ */
+@TableName("t_data_goods")
+@ApiModel
+public class DataGoods implements Serializable {
+    private static final long serialVersionUID = 938517475031285541L;
+    /**
+     * 数据商品id
+     */
+    private Long dataGoodsId;
+    /**
+     * 商品分类id（行业）
+     */
+    private Long categoryId;
+    /**
+     * 数据商户id
+     */
+    private Long userId;
+    /**
+     * 数据商品名称
+     */
+    private String dataName;
+    /**
+     * 数据类型：01api，02数据包
+     */
+    private String dataType;
+    /**
+     * 数据商品标签
+     */
+    private String dataLabel;
+    /**
+     * 数据商品图片
+     */
+    private String dataPicture;
+    /**
+     * 数据商品价格
+     */
+    private Double dataPrice;
+    /**
+     * 优惠价格
+     */
+    private Double discountPrice;
+    /**
+     * 价格类型：01免费，02收费
+     */
+    private String priceType;
+    /**
+     * 商品规格
+     */
+    private String goodsStandards;
+    /**
+     * 数据状态：01预售，02在售中，03下架，04上架
+     */
+    private String dataStatus;
+    /**
+     * 审核状态：01待审核，02已审核，03未通过
+     */
+    private String auditStatus;
+    /**
+     * 清洗规则（脱敏校验）
+     */
+    private String cleanRule;
+    /**
+     * 驳回原因
+     */
+    private String rejectReason;
+    /**
+     * 审核人
+     */
+    private String auditPerson;
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+    /**
+     * 创建人
+     */
+    private String crePerson;
+    /**
+     * 更新时间
+     */
+    private Date uptTime;
+    /**
+     * 更新人
+     */
+    private String uptPerson;
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+    /**
+     * 年（元）
+     */
+    private Double yearType;
+    /**
+     * 季（元）
+     */
+    private Double seasonType;
+    /**
+     * 月（元）
+     */
+    private Double monthType;
+    /**
+     * 次（元）
+     */
+    private Double secondType;
+
+
+    public Long getDataGoodsId() {
+        return dataGoodsId;
+    }
+
+    public void setDataGoodsId(Long dataGoodsId) {
+        this.dataGoodsId = dataGoodsId;
+    }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getDataName() {
+        return dataName;
+    }
+
+    public void setDataName(String dataName) {
+        this.dataName = dataName;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public String getDataLabel() {
+        return dataLabel;
+    }
+
+    public void setDataLabel(String dataLabel) {
+        this.dataLabel = dataLabel;
+    }
+
+    public String getDataPicture() {
+        return dataPicture;
+    }
+
+    public void setDataPicture(String dataPicture) {
+        this.dataPicture = dataPicture;
+    }
+
+    public Double getDataPrice() {
+        return dataPrice;
+    }
+
+    public void setDataPrice(Double dataPrice) {
+        this.dataPrice = dataPrice;
+    }
+
+    public Double getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public void setDiscountPrice(Double discountPrice) {
+        this.discountPrice = discountPrice;
+    }
+
+    public String getPriceType() {
+        return priceType;
+    }
+
+    public void setPriceType(String priceType) {
+        this.priceType = priceType;
+    }
+
+    public String getGoodsStandards() {
+        return goodsStandards;
+    }
+
+    public void setGoodsStandards(String goodsStandards) {
+        this.goodsStandards = goodsStandards;
+    }
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getCleanRule() {
+        return cleanRule;
+    }
+
+    public void setCleanRule(String cleanRule) {
+        this.cleanRule = cleanRule;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getAuditPerson() {
+        return auditPerson;
+    }
+
+    public void setAuditPerson(String auditPerson) {
+        this.auditPerson = auditPerson;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public Date getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(Date creTime) {
+        this.creTime = creTime;
+    }
+
+    public String getCrePerson() {
+        return crePerson;
+    }
+
+    public void setCrePerson(String crePerson) {
+        this.crePerson = crePerson;
+    }
+
+    public Date getUptTime() {
+        return uptTime;
+    }
+
+    public void setUptTime(Date uptTime) {
+        this.uptTime = uptTime;
+    }
+
+    public String getUptPerson() {
+        return uptPerson;
+    }
+
+    public void setUptPerson(String uptPerson) {
+        this.uptPerson = uptPerson;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Double getYearType() {
+        return yearType;
+    }
+
+    public void setYearType(Double yearType) {
+        this.yearType = yearType;
+    }
+
+    public Double getSeasonType() {
+        return seasonType;
+    }
+
+    public void setSeasonType(Double seasonType) {
+        this.seasonType = seasonType;
+    }
+
+    public Double getMonthType() {
+        return monthType;
+    }
+
+    public void setMonthType(Double monthType) {
+        this.monthType = monthType;
+    }
+
+    public Double getSecondType() {
+        return secondType;
+    }
+
+    public void setSecondType(Double secondType) {
+        this.secondType = secondType;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DataGoodsApi.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * api商品(DataGoodsApi)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:31
+ */
+@TableName("t_data_goods_api")
+@ApiModel
+public class DataGoodsApi implements Serializable {
+    private static final long serialVersionUID = -14346819849726413L;
+    /**
+     * api商品id
+     */
+    private Long goodsApi;
+    /**
+     * 数据id
+     */
+    private Long dataGoodsId;
+    /**
+     * api服务名称
+     */
+    private String apiName;
+    /**
+     * 请求类型（方式）
+     */
+    private String requestType;
+    /**
+     * api接口地址
+     */
+    private String apiUrl;
+    /**
+     * api接口方法
+     */
+    private String apiMethod;
+    /**
+     * api请求协议：http，https
+     */
+    private String apiProtocl;
+    /**
+     * api返回数据样例
+     */
+    private String returnDataExample;
+    /**
+     * api请求样例
+     */
+    private String requestExample;
+    /**
+     * 返回类型
+     */
+    private String returnType;
+    /**
+     * apikey
+     */
+    private String apiKey;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+    /**
+     * 创建人
+     */
+    private String crePerson;
+    /**
+     * 更新人
+     */
+    private String uptPerson;
+    /**
+     * 更新时间
+     */
+    private Date uptTime;
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+
+    public Long getGoodsApi() {
+        return goodsApi;
+    }
+
+    public void setGoodsApi(Long goodsApi) {
+        this.goodsApi = goodsApi;
+    }
+
+    public Long getDataGoodsId() {
+        return dataGoodsId;
+    }
+
+    public void setDataGoodsId(Long dataGoodsId) {
+        this.dataGoodsId = dataGoodsId;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getApiMethod() {
+        return apiMethod;
+    }
+
+    public void setApiMethod(String apiMethod) {
+        this.apiMethod = apiMethod;
+    }
+
+    public String getApiProtocl() {
+        return apiProtocl;
+    }
+
+    public void setApiProtocl(String apiProtocl) {
+        this.apiProtocl = apiProtocl;
+    }
+
+    public String getReturnDataExample() {
+        return returnDataExample;
+    }
+
+    public void setReturnDataExample(String returnDataExample) {
+        this.returnDataExample = returnDataExample;
+    }
+
+    public String getRequestExample() {
+        return requestExample;
+    }
+
+    public void setRequestExample(String requestExample) {
+        this.requestExample = requestExample;
+    }
+
+    public String getReturnType() {
+        return returnType;
+    }
+
+    public void setReturnType(String returnType) {
+        this.returnType = returnType;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public Date getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(Date creTime) {
+        this.creTime = creTime;
+    }
+
+    public String getCrePerson() {
+        return crePerson;
+    }
+
+    public void setCrePerson(String crePerson) {
+        this.crePerson = crePerson;
+    }
+
+    public String getUptPerson() {
+        return uptPerson;
+    }
+
+    public void setUptPerson(String uptPerson) {
+        this.uptPerson = uptPerson;
+    }
+
+    public Date getUptTime() {
+        return uptTime;
+    }
+
+    public void setUptTime(Date uptTime) {
+        this.uptTime = uptTime;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DataGoodsApiParams.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * api商品参数配置(TDataGoodsApiParams)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:31
+ */
+@TableName("t_data_goods_api_params")
+@ApiModel
+public class DataGoodsApiParams implements Serializable {
+    private static final long serialVersionUID = 944366688061324185L;
+    /**
+     * api参数id
+     */
+    private Long apiParamsId;
+    /**
+     * api商品id
+     */
+    private Long goodsApi;
+    /**
+     * 参数分类：01公共参数，02请求参数，03响应参数，04请求头参数，05状态码参数
+     */
+    private String paramsDiff;
+    /**
+     * 参数名称
+     */
+    private String paramsName;
+    /**
+     * 参数类型
+     */
+    private String paramsType;
+    /**
+     * 参数描述
+     */
+    private String paramsDesc;
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 是否必选：Y是，N否
+     */
+    private String ifRequird;
+    /**
+     * 删除标识：Y是，N否
+     */
+    private String delFlag;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+    /**
+     * 更新时间
+     */
+    private Date uptTime;
+
+
+    public Long getApiParamsId() {
+        return apiParamsId;
+    }
+
+    public void setApiParamsId(Long apiParamsId) {
+        this.apiParamsId = apiParamsId;
+    }
+
+    public Long getGoodsApi() {
+        return goodsApi;
+    }
+
+    public void setGoodsApi(Long goodsApi) {
+        this.goodsApi = goodsApi;
+    }
+
+    public String getParamsDiff() {
+        return paramsDiff;
+    }
+
+    public void setParamsDiff(String paramsDiff) {
+        this.paramsDiff = paramsDiff;
+    }
+
+    public String getParamsName() {
+        return paramsName;
+    }
+
+    public void setParamsName(String paramsName) {
+        this.paramsName = paramsName;
+    }
+
+    public String getParamsType() {
+        return paramsType;
+    }
+
+    public void setParamsType(String paramsType) {
+        this.paramsType = paramsType;
+    }
+
+    public String getParamsDesc() {
+        return paramsDesc;
+    }
+
+    public void setParamsDesc(String paramsDesc) {
+        this.paramsDesc = paramsDesc;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIfRequird() {
+        return ifRequird;
+    }
+
+    public void setIfRequird(String ifRequird) {
+        this.ifRequird = ifRequird;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(Date creTime) {
+        this.creTime = creTime;
+    }
+
+    public Date getUptTime() {
+        return uptTime;
+    }
+
+    public void setUptTime(Date uptTime) {
+        this.uptTime = uptTime;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DataGoodsCategory.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据商品分类(行业)(TDataGoodsCategory)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:32
+ */
+@TableName("t_data_goods_category")
+@ApiModel
+public class DataGoodsCategory implements Serializable {
+    private static final long serialVersionUID = -54881838919746328L;
+    /**
+     * 商品分类id
+     */
+    private Long categoryId;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+    /**
+     * 是否为子节点：Y是，N否
+     */
+    private String ifChild;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+    /**
+     * 更新时间
+     */
+    private Date uptTime;
+
+    private String delFlag;
+
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getIfChild() {
+        return ifChild;
+    }
+
+    public void setIfChild(String ifChild) {
+        this.ifChild = ifChild;
+    }
+
+    public Date getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(Date creTime) {
+        this.creTime = creTime;
+    }
+
+    public Date getUptTime() {
+        return uptTime;
+    }
+
+    public void setUptTime(Date uptTime) {
+        this.uptTime = uptTime;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DataGoodsPack.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据包商品(TDataGoodsPack)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:32
+ */
+@TableName("t_data_goods_pack")
+@ApiModel
+public class DataGoodsPack implements Serializable {
+    private static final long serialVersionUID = 974042077669049846L;
+    /**
+     * 数据包id
+     */
+    private Long goodsPackId;
+    /**
+     * 数据id
+     */
+    private Long dataGoodsId;
+    /**
+     * 数据包名称
+     */
+    private String packName;
+    /**
+     * 数据包存储路径
+     */
+    private String packUrl;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+    /**
+     * 创建人
+     */
+    private String crePerson;
+    /**
+     * 更新时间
+     */
+    private Date uptTime;
+    /**
+     * 更新人
+     */
+    private String uptPerson;
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+
+    public Long getGoodsPackId() {
+        return goodsPackId;
+    }
+
+    public void setGoodsPackId(Long goodsPackId) {
+        this.goodsPackId = goodsPackId;
+    }
+
+    public Long getDataGoodsId() {
+        return dataGoodsId;
+    }
+
+    public void setDataGoodsId(Long dataGoodsId) {
+        this.dataGoodsId = dataGoodsId;
+    }
+
+    public String getPackName() {
+        return packName;
+    }
+
+    public void setPackName(String packName) {
+        this.packName = packName;
+    }
+
+    public String getPackUrl() {
+        return packUrl;
+    }
+
+    public void setPackUrl(String packUrl) {
+        this.packUrl = packUrl;
+    }
+
+    public Date getCreTime() {
+        return creTime;
+    }
+
+    public void setCreTime(Date creTime) {
+        this.creTime = creTime;
+    }
+
+    public String getCrePerson() {
+        return crePerson;
+    }
+
+    public void setCrePerson(String crePerson) {
+        this.crePerson = crePerson;
+    }
+
+    public Date getUptTime() {
+        return uptTime;
+    }
+
+    public void setUptTime(Date uptTime) {
+        this.uptTime = uptTime;
+    }
+
+    public String getUptPerson() {
+        return uptPerson;
+    }
+
+    public void setUptPerson(String uptPerson) {
+        this.uptPerson = uptPerson;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/entity/DefinitionApi.java

+package com.jz.manage.moduls.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 定义api(DefinitionApi)实体类
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:33
+ */
+@TableName("t_definition_api")
+@ApiModel
+public class DefinitionApi implements Serializable {
+    private static final long serialVersionUID = 816553116583412022L;
+    /**
+     * 定义api接口id
+     */
+    private Long definitionApiId;
+    /**
+     * 应用名称
+     */
+    private String applyApiName;
+    /**
+     * api_id
+     */
+    private String applyApiId;
+    /**
+     * 接口描述
+     */
+    private String interfaceDesc;
+    /**
+     * 版本号
+     */
+    private String versionNumber;
+    /**
+     * 加密方式
+     */
+    private String encryMode;
+    /**
+     * 传输方式
+     */
+    private String transMode;
+    /**
+     * 正式地址
+     */
+    private String formalAddress;
+    /**
+     * 超时时间
+     */
+    private Date overTime;
+    /**
+     * 功能
+     */
+    private String apiFunction;
+    /**
+     * 请求方式
+     */
+    private String requestType;
+    /**
+     * 每单接口调用频率
+     */
+    private String oneCallFrequency;
+    /**
+     * 整个接口的调用频率
+     */
+    private String allCallFrequency;
+    /**
+     * 客户请求token
+     */
+    private String requestToken;
+    /**
+     * 盐值
+     */
+    private String saltValue;
+    /**
+     * 处理状态：01待处理，02ETL处理中，03ETL处理完成，04接口生成完成
+     */
+    private String handleStatus;
+    /**
+     * 处理结果：成功/失败码
+     */
+    private String handleResult;
+    /**
+     * 创建时间
+     */
+    private Date creTime;
+
+
+    public Long getDefinitionApiId() {
+        return definitionApiId;
+    }
+
+    public void setDefinitionApiId(Long definitionApiId) {
+        this.