实体对象 挪入common

src/main/java/com/dk/mdm/controller/mst/StaffPurviewController.java

@@ -1,7 +1,7 @@
 package com.dk.mdm.controller.mst;
 
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.model.pojo.mst.StaffPurview;
+import com.dk.common.model.pojo.mst.StaffPurview;
 import com.dk.common.service.BaseService;
 import com.dk.common.model.vo.mst.StaffVO;
 import com.dk.mdm.service.mst.StaffService;

src/main/java/com/dk/mdm/controller/mst/StaffRightController.java

@@ -1,7 +1,7 @@
 package com.dk.mdm.controller.mst;
 
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.model.pojo.mst.StaffRight;
+import com.dk.common.model.pojo.mst.StaffRight;
 import com.dk.common.service.BaseService;
 import com.dk.common.model.vo.mst.StaffVO;
 import com.dk.mdm.service.mst.StaffService;

src/main/java/com/dk/mdm/infrastructure/convert/mst/StaffRightConvert.java

@@ -1,6 +1,6 @@
 package com.dk.mdm.infrastructure.convert.mst;
 
-import com.dk.mdm.model.pojo.mst.StaffRight;
+import com.dk.common.model.pojo.mst.StaffRight;
 import com.dk.mdm.model.vo.mst.StaffRightVO;
 import org.mapstruct.Mapper;
 

src/main/java/com/dk/mdm/mapper/mst/StaffPurviewMapper.java

@@ -1,6 +1,6 @@
 package com.dk.mdm.mapper.mst;
 
-import com.dk.mdm.model.pojo.mst.StaffPurview;
+import com.dk.common.model.pojo.mst.StaffPurview;
 import com.dk.common.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/dk/mdm/mapper/mst/StaffPurviewMapper.xml

@@ -10,7 +10,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.StaffPurview">
+    <resultMap id="BaseResultMap" type="com.dk.common.model.pojo.mst.StaffPurview">
         <id column="staff_id" property="staffId"/>
         <result column="purview_code" property="purviewCode"/>
         <result column="flg_nolimit" property="flgNolimit"/>

src/main/java/com/dk/mdm/mapper/mst/StaffRightMapper.java

@@ -1,6 +1,6 @@
 package com.dk.mdm.mapper.mst;
 
-import com.dk.mdm.model.pojo.mst.StaffRight;
+import com.dk.common.model.pojo.mst.StaffRight;
 import com.dk.common.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dk/mdm/mapper/mst/StaffRightMapper.xml

@@ -10,7 +10,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.StaffRight">
+    <resultMap id="BaseResultMap" type="com.dk.common.model.pojo.mst.StaffRight">
         <id column="staff_id" property="staffId"/>
         <result column="fun_uuid" property="funUuid" typeHandler="UuidTypeHandler"/>
         <result column="right_type" property="rightType"/>

src/main/java/com/dk/mdm/model/pojo/mst/StaffPurview.java

@@ -1,160 +0,0 @@
-package com.dk.mdm.model.pojo.mst;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.*;
-import java.io.Serializable;
-
-import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.*;
-import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.List;
-import java.time.LocalDateTime;
-
-/**
- *  员工数据范围
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ExportTitle("员工数据范围")
-@TableName(value = "t_mst_staff_purview", schema =  "dkic_b",autoResultMap = true)
-@ApiModel(value="实体类：员工数据范围", description="表名：t_mst_staff_purview")
-public class StaffPurview extends PageInfo<StaffPurview> implements Serializable {
-
-    /*
-     * 数据库字段
-     */
-
-    /**
-     * 员工ID
-     */
-    @TableId(value = "staff_id", type = IdType.AUTO)
-    @ApiModelProperty(value = "员工ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String staffId;
-
-
-    /**
-     * 范围权限编码
-     */
-    @Excel(name = "范围权限编码")
-    @ApiModelProperty(value = "范围权限编码")
-    private String purviewCode;
-
-
-    /**
-     * 范围权限标识 (true：不限制)
-     */
-    @Excel(name = "范围权限标识 (true：不限制)")
-    @ApiModelProperty(value = "范围权限标识 (true：不限制)")
-    private Boolean flgNolimit;
-
-
-    /**
-     * 数据ID
-     */
-    @Excel(name = "数据ID")
-    @ApiModelProperty(value = "数据ID")
-    @TableField(typeHandler = UuidListTypeHandler.class)
-    private List<String> dataIds;
-
-
-    /**
-     * 企业ID
-     */
-    @Excel(name = "企业ID")
-    @ApiModelProperty(value = "企业ID")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer cpId;
-
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
-    private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/dk/mdm/model/pojo/mst/StaffRight.java

@@ -1,152 +0,0 @@
-package com.dk.mdm.model.pojo.mst;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.*;
-import java.io.Serializable;
-
-import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.*;
-import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.List;
-import java.time.LocalDateTime;
-
-/**
- *  员工权限
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ExportTitle("员工权限")
-@TableName(value = "t_mst_staff_right", autoResultMap = true,schema = "dkic_b")
-@ApiModel(value="实体类：员工权限", description="表名：t_mst_staff_right")
-public class StaffRight extends PageInfo<StaffRight> implements Serializable {
-
-    /*
-     * 数据库字段
-     */
-
-    /**
-     * 员工ID
-     */
-    @TableId(value = "staff_id", type = IdType.AUTO)
-    @ApiModelProperty(value = "员工ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String staffId;
-
-
-    /**
-     * 功能权限
-     */
-    @Excel(name = "功能权限")
-    @ApiModelProperty(value = "功能权限")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String funUuid;
-
-
-    /**
-     * 权限类型 (1：授予 -1：拒绝)
-     */
-    @Excel(name = "权限类型 (1：授予 -1：拒绝)")
-    @ApiModelProperty(value = "权限类型 (1：授予 -1：拒绝)")
-    private Integer rightType;
-
-
-    /**
-     * 企业ID
-     */
-    @Excel(name = "企业ID")
-    @ApiModelProperty(value = "企业ID")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer cpId;
-
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
-    private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/dk/mdm/service/mst/StaffPurviewService.java

@@ -2,11 +2,11 @@ package com.dk.mdm.service.mst;
 
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.model.pojo.mst.StaffPurview;
+import com.dk.common.model.pojo.mst.StaffPurview;
 import com.dk.mdm.mapper.mst.StaffPurviewMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.mst.StaffRight;
+import com.dk.common.model.pojo.mst.StaffRight;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dk/mdm/service/mst/StaffRightService.java

@@ -2,8 +2,7 @@ package com.dk.mdm.service.mst;
 
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.model.pojo.mst.RoleFun;
-import com.dk.mdm.model.pojo.mst.StaffRight;
+import com.dk.common.model.pojo.mst.StaffRight;
 import com.dk.mdm.mapper.mst.StaffRightMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -3,6 +3,8 @@ package com.dk.mdm.service.mst;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.model.pojo.mst.StaffPurview;
+import com.dk.common.model.pojo.mst.StaffRight;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;