'1'

hzgzpt-admin/pom.xml

@@ -44,13 +44,6 @@
             <artifactId>hzgzpt-framework</artifactId>
         </dependency>
 
-        <!-- pc端-->
-        <dependency>
-            <groupId>com.miaxis</groupId>
-            <artifactId>hzgzpt-service-pc</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/BaseBusinessEntity.java

@@ -1,12 +1,16 @@
 package com.miaxis.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Entity基类
@@ -33,6 +37,13 @@ public class BaseBusinessEntity implements Serializable
     @ApiModelProperty(value = "更新时间" ,hidden = true)
     private Date updateTime;
 
+    /** 请求参数 */
+    @TableField(exist = false)
+    @JsonIgnore
+    @ApiModelProperty(value = "请求参数",hidden = true)
+    private Map<String, Object> params = new HashMap<String, Object>();
+
+
 
 
 

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java

@@ -1,5 +1,6 @@
 package com.miaxis.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
@@ -23,10 +24,12 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     @ApiModelProperty(value = "搜索值" ,hidden = true)
     private String searchValue;
 
     /** 创建者 */
+    @TableField(exist = false)
     @ApiModelProperty(value = "创建者"  ,hidden = true)
     private String createBy;
 
@@ -35,30 +38,35 @@ public class BaseEntity implements Serializable
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /** 更新者 */
-    @ApiModelProperty(value = "更新者"  ,hidden = true)
-    private String updateBy;
-
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
     @ApiModelProperty(value = "更新时间" ,hidden = true)
     private Date updateTime;
 
+    /** 更新者 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "更新者"  ,hidden = true)
+    private String updateBy;
+
     /** 备注 */
+    @TableField(exist = false)
     @ApiModelProperty(value = "备注" ,hidden = true)
     private String remark;
 
     /** 开始时间 */
     @JsonIgnore
+    @TableField(exist = false)
     @ApiModelProperty(value = "开始时间")
     private String beginTime;
 
     /** 结束时间 */
     @JsonIgnore
+    @TableField(exist = false)
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
     /** 请求参数 */
+    @TableField(exist = false)
     @ApiModelProperty(value = "请求参数",hidden = true)
     private Map<String, Object> params;
 

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/BaseQueryEntity.java

@@ -1,40 +0,0 @@
-package com.miaxis.common.core.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Entity基类
- *
- * @author miaxis
- */
-@ApiModel(value = "BaseQueryEntity", description = "查询列表基类")
-@Data
-public class BaseQueryEntity implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间"  ,hidden = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-
-    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
-    @ApiModelProperty(value = "更新时间" ,hidden = true)
-    private Date updateTime;
-    /** 请求参数 */
-    @ApiModelProperty(value = "请求参数",hidden = true)
-    private Map<String, Object> params = new HashMap<String, Object>();
-
-
-
-}

hzgzpt-framework/src/main/java/com/miaxis/framework/aspectj/DataScopeAspect.java

@@ -2,7 +2,6 @@ package com.miaxis.framework.aspectj;
 
 import com.miaxis.common.annotation.DataScope;
 import com.miaxis.common.core.domain.BaseEntity;
-import com.miaxis.common.core.domain.BaseQueryEntity;
 import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.model.LoginUser;
@@ -154,10 +153,6 @@ public class DataScopeAspect
                 if (params instanceof BaseEntity){
                     BaseEntity baseEntity = (BaseEntity) params;
                     baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
-                }else if (params instanceof BaseQueryEntity){
-                    BaseQueryEntity baseEntity = (BaseQueryEntity) params;
-                    baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
-
                 }
             }
         }

hzgzpt-service-pc/pom.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hzgzpt</artifactId>
-        <groupId>com.miaxis</groupId>
-        <version>3.2.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hzgzpt-service-pc</artifactId>
-
-    <dependencies>
-
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.miaxis</groupId>
-            <artifactId>hzgzpt-common</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

hzgzpt-service-pc/src/main/resources/mapper/school/SchoolClassTypeMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.pc.school.mapper.SchoolClassTypeMapper">
-
-    <resultMap type="SchoolClassType" id="SchoolClassTypeResult">
-        <result property="id"    column="id"    />
-        <result property="className"    column="class_name"    />
-        <result property="totalPrice"    column="total_price"    />
-        <result property="train"    column="train"    />
-        <result property="pxcx"    column="pxcx"    />
-        <result property="payType"    column="pay_type"    />
-        <result property="minPrice"    column="min_price"    />
-        <result property="oneTime"    column="one_time"    />
-        <result property="twoTime"    column="two_time"    />
-        <result property="threeSimulationTime"    column="three_simulation_time"    />
-        <result property="threePracticeTime"    column="three_practice_time"    />
-        <result property="threeTheoryTime"    column="three_theory_time"    />
-        <result property="photoUrl"    column="photo_url"    />
-        <result property="regionId"    column="region_id"    />
-        <result property="pdfUrl"    column="pdf_url"    />
-        <result property="contractEndTime"    column="contract_end_time"    />
-        <result property="crdateTime"    column="crdate_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-</mapper>

hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachInfoPcDTO.java

@@ -1,6 +1,6 @@
 package com.miaxis.coach.dto;
 
-import com.miaxis.common.core.domain.BaseQueryEntity;
+import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "CoachInfo", description = "pc教练对象入参")
-public class CoachInfoPcDTO extends BaseQueryEntity {
+public class CoachInfoPcDTO extends BaseEntity {
 
     /** 教练员全国统一编号 */
     @ApiModelProperty(value = "教练员全国统一编号")

pom.xml

@@ -243,7 +243,6 @@
         <!--<module>hzgzpt-quartz</module>-->
         <module>hzgzpt-generator</module>
         <module>hzgzpt-common</module>
-        <module>hzgzpt-service-pc</module>
         <module>hzgzpt-service</module>
     </modules>
     <packaging>pom</packaging>