修改代码生成器代码并添加单元测试代码生成逻辑

Author: ljk163wy

pom.xml

@@ -119,6 +119,12 @@
             <version>2.6</version>
             <!--<scope>compile</scope>-->
         </dependency>
+
+        <dependency>
+            <groupId>com.github.jsonzou</groupId>
+            <artifactId>jmockdata</artifactId>
+            <version>4.2.0</version>
+        </dependency>
         <!--代码生成器依赖-->
 
         <dependency>

src/main/java/com/company/project/Application.java

@@ -19,7 +19,7 @@
  * @Description：自定义符号日志输出代码来源 RuoYi：https://github.com/lerry903/RuoYi（在其基础上为其添加颜色输出展示）
  **/
 @SpringBootApplication
-@ComponentScan(basePackages={"cn.hutool.extra.spring"})
+@ComponentScan(basePackages={"cn.hutool.extra.spring","com.company.project"})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 public class Application {
     private static Logger log = LoggerFactory.getLogger(Application.class);

src/main/java/com/company/project/common/constants/ProjectConstant.java

@@ -18,7 +18,7 @@ private JsonConvertUtil() {}
      * JSON 转 Object
      */
     public static <T> T jsonToObject(String pojo,Class<T> clazz) {
-        Gson gson = initGson(null, false);
+        Gson gson = initGson("yyyy-MM-dd HH:mm:ss", false);
         return gson.fromJson(pojo, clazz);
     }
     /**
@@ -32,7 +32,7 @@ public static <T> T jsonToObject(String pojo, String dateFormat ,Class<T> clazz,
      * JSON 转 Object
      */
     public static <T> String toJson(T t) {
-        Gson gson = initGson(null, false);
+        Gson gson = initGson("yyyy-MM-dd HH:mm:ss", false);
         return gson.toJson(t);
     }
     /**

src/main/java/com/company/project/common/utils/JsonConvertUtil.java

@@ -19,7 +19,7 @@ public class BasicEntity {
     /** 创建者 */
     @ApiModelProperty(hidden=true)
     @JsonIgnore
-    private String createBy;
+    private Long createBy;
 
     /** 创建时间 */
     @ApiModelProperty(hidden=true)
@@ -29,14 +29,13 @@ public class BasicEntity {
     /** 更新者 */
     @ApiModelProperty(hidden=true)
     @JsonIgnore
-    private String updateBy;
+    private Long updateBy;
 
     /** 更新时间 */
     @ApiModelProperty(hidden=true)
     @JsonIgnore
     private Date updateTime;
     @ApiModelProperty(hidden=true)
-    @JsonIgnore
     private Integer deleteFlag;
 
     public Integer getDeleteFlag() {
@@ -47,11 +46,11 @@ public void setDeleteFlag(Integer deleteFlag) {
         this.deleteFlag = deleteFlag;
     }
 
-    public String getCreateBy() {
+    public Long getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(String createBy) {
+    public void setCreateBy(Long createBy) {
         this.createBy = createBy;
     }
 
@@ -63,11 +62,11 @@ public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy() {
+    public Long getUpdateBy() {
         return updateBy;
     }
 
-    public void setUpdateBy(String updateBy) {
+    public void setUpdateBy(Long updateBy) {
         this.updateBy = updateBy;
     }
 

src/main/java/com/company/project/core/BasicEntity.java

@@ -0,0 +1,86 @@
+package com.company.project.demoUser.domain;
+import com.company.project.core.BasicEntity;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * @Author： CodeGenerator
+ * @Date： 2020/08/08.
+ * @Description：
+ **/
+public class DemoUser extends BasicEntity{
+
+
+    @ApiModelProperty(value="",name="id",example="1")
+    private Long id;
+
+    @ApiModelProperty(value="",name="username",example="string")
+    private String username;
+
+    @ApiModelProperty(value="",name="password",example="string")
+    private String password;
+
+    @ApiModelProperty(value="",name="nickName",example="string")
+    private String nickName;
+
+    @ApiModelProperty(value="",name="email",example="string")
+    private String email;
+
+    @ApiModelProperty(value="",name="sex",example="1")
+    private Integer sex;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="",name="registerDate",example="2020-01-01")
+    private Date registerDate;
+
+
+    public Long getId(){
+        return id;
+    }
+    public void setId(Long  id){
+        this.id = id;
+    }
+
+    public String getUsername(){
+        return username;
+    }
+    public void setUsername(String  username){
+        this.username = username;
+    }
+
+    public String getPassword(){
+        return password;
+    }
+    public void setPassword(String  password){
+        this.password = password;
+    }
+
+    public String getNickName(){
+        return nickName;
+    }
+    public void setNickName(String  nickName){
+        this.nickName = nickName;
+    }
+
+    public String getEmail(){
+        return email;
+    }
+    public void setEmail(String  email){
+        this.email = email;
+    }
+
+    public Integer getSex(){
+        return sex;
+    }
+    public void setSex(Integer  sex){
+        this.sex = sex;
+    }
+
+    public Date getRegisterDate(){
+        return registerDate;
+    }
+    public void setRegisterDate(Date  registerDate){
+        this.registerDate = registerDate;
+    }
+}

src/main/java/com/company/project/demoUser/domain/DemoUser.java

@@ -0,0 +1,15 @@
+package com.company.project.demoUser.mapper;
+import com.company.project.demoUser.domain.DemoUser;
+import com.company.project.core.IMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @Author： CodeGenerator
+ * @Date： 2020/08/08.
+ * @Description：
+ **/
+@Mapper
+public interface DemoUserMapper extends IMapper<DemoUser>{
+
+}

src/main/java/com/company/project/demoUser/mapper/DemoUserMapper.java

@@ -0,0 +1,13 @@
+package com.company.project.demoUser.service;
+import com.company.project.demoUser.domain.DemoUser;
+import com.company.project.core.Service;
+
+
+/**
+* @Author： CodeGenerator
+* @Date： 2020/08/08.
+* @Description：
+**/
+public interface DemoUserService extends Service<DemoUser> {
+
+}

src/main/java/com/company/project/demoUser/service/DemoUserService.java

@@ -0,0 +1,30 @@
+package com.company.project.demoUser.service.impl;
+
+import com.company.project.demoUser.mapper.DemoUserMapper;
+import com.company.project.demoUser.domain.DemoUser;
+import com.company.project.demoUser.service.DemoUserService;
+import com.company.project.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.company.project.core.IMapper;
+
+
+/**
+ * @Author： CodeGenerator
+ * @Date： 2020/08/08.
+ * @Description：
+ **/
+@Service
+public class DemoUserServiceImpl extends AbstractService<DemoUser> implements DemoUserService {
+
+    @Autowired
+    private DemoUserMapper demoUserMapper;
+
+    @Override
+    public IMapper<DemoUser> getMapper() {
+        return demoUserMapper;
+    }
+
+}