首次提交

pom.xml

@@ -30,11 +30,21 @@
 
 
     <dependencies>
-        <!-- 引入sdk -->
+        <!-- 引入四维sdk -->
         <dependency>
             <groupId>org.4dage</groupId>
             <artifactId>4dage-back-sdk</artifactId>
-            <version>1.0.2-RELEASE</version>
+            <version>1.0.2.2-RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-extension</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 引入nacos配置中心 -->
@@ -47,6 +57,10 @@
                     <groupId>commons-io</groupId>
                     <artifactId>commons-io</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- 引入nacos服务发现 -->
@@ -61,6 +75,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.3.1.tmp</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--   <dependency>
+               <groupId>com.baomidou</groupId>
+               <artifactId>mybatis-plus-extension</artifactId>
+               <version>3.2.0</version>
+           </dependency>-->
 
 
     </dependencies>

src/main/java/fcb/project/manager/base/config/MyBatisPlusLogicalDeleteConfig.java

@@ -0,0 +1,19 @@
+package fcb.project.manager.base.config;
+
+import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/7 14:12
+ * 4
+ */
+@Configuration
+public class MyBatisPlusLogicalDeleteConfig {
+    @Bean
+    public ISqlInjector sqlInjector() {
+        return new LogicSqlInjector();
+    }
+}

src/main/java/fcb/project/manager/base/dao/TmEstateDao.java

@@ -0,0 +1,16 @@
+package fcb.project.manager.base.dao;
+
+import fcb.project.manager.base.entity.TmEstate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+public interface TmEstateDao extends BaseMapper<TmEstate> {
+
+}

src/main/java/fcb/project/manager/base/dao/TmHouseDao.java

@@ -0,0 +1,16 @@
+package fcb.project.manager.base.dao;
+
+import fcb.project.manager.base.entity.TmHouse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+public interface TmHouseDao extends BaseMapper<TmHouse> {
+
+}

src/main/java/fcb/project/manager/base/entity/TmEstate.java

@@ -0,0 +1,64 @@
+package fcb.project.manager.base.entity;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmEstate对象", description="")
+public class TmEstate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一ID")
+    private String id;
+
+    @ApiModelProperty(value = "楼盘名称")
+    private String estateName;
+
+    @ApiModelProperty(value = "所属公司ID")
+    private String belongCompanyId;
+
+    @ApiModelProperty(value = "所属公司名称")
+    private String belongCompanyName;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createById;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除：0->未删除; 1->已删除")
+    @TableLogic
+    @TableField(value = "isDelete" , fill = FieldFill.INSERT)
+    private Boolean isDelete;
+
+
+}

src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -0,0 +1,72 @@
+package fcb.project.manager.base.entity;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmHouse对象", description="")
+public class TmHouse implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private Integer id;
+
+    @ApiModelProperty(value = "封面照片url")
+    private String coverImagUrl;
+
+    @ApiModelProperty(value = "房源标题")
+    private String houseTitle;
+
+    @ApiModelProperty(value = "创建者ID")
+    private Integer createById;
+
+    @ApiModelProperty(value = "创建者名称")
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "审核人ID")
+    private Integer auditId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditName;
+
+    @ApiModelProperty(value = "审核时间")
+    private LocalDateTime auditTime;
+
+    @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
+    @TableLogic
+    @TableField(value = "isDelete" , fill = FieldFill.INSERT)
+    private Boolean isDelete;
+
+
+}

src/main/java/fcb/project/manager/base/generator/CodeGenerator.java

@@ -1,14 +1,100 @@
 package fcb.project.manager.base.generator;
 
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import fdage.back.sdk.base.mybatis.MysqlGenerator;
+import lombok.extern.log4j.Log4j2;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 2 * @Author: Abner
  * 3 * @Date: 2021/1/5 18:23
  * 4
  */
+@Log4j2
 public class CodeGenerator {
 
-    public static void main(String[] args){
+    public static void main(String[] args) {
+        AutoGenerator mpg = new AutoGenerator();
+        GlobalConfig gc = new GlobalConfig();
+        String projectPath = System.getProperty("user.dir");
+        gc.setOutputDir(projectPath + "/src/main/java");
+        // 作者
+        gc.setAuthor("abner");
+        //生成代码后是否打开文件夹
+        gc.setOpen(false);
+        gc.setSwagger2(true);
+        gc.setMapperName("%sDao");
+        //是否覆盖
+        gc.setFileOverride(true);
+        mpg.setGlobalConfig(gc);
+
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://120.25.146.52:3306/fcb-project-manager?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("4dkk2020test%");
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        // 模块名称, 这里可以根据不同模块来写
+        pc.setModuleName("base");
+        // 父包名
+        pc.setParent("fcb.project.manager");
+        pc.setMapper("dao");
+        pc.setController("controller");
+
+        mpg.setPackageInfo(pc);
+
+        // 配置模板
+        TemplateConfig templateConfig = new TemplateConfig();
+
+        //控制 不生成 controller
+        templateConfig.setController("");
+
+        templateConfig.setXml(null);
+        mpg.setTemplate(templateConfig);
+
+
+        // 注入自定义配置，可以在 VM 中使用 cfg.abc 【可无】
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("abc", this.getConfig().getGlobalConfig().getAuthor() + "-mp");
+                this.setMap(map);
+            }
+        };
+
+        // 调整 xml 生成目录演示
+        List<FileOutConfig> focList = new ArrayList<FileOutConfig>();
+        focList.add(new FileOutConfig("/templates/mapper.xml.vm") {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return  "E:\\code\\projects\\fcb-project-manager\\src\\main\\resources\\mybatis\\mappers\\" + tableInfo.getEntityName() + "Mapper.xml";
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
 
 
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setEntityLombokModel(true);
+        // 如果要生成多个,这里可以传入String[]
+        strategy.setInclude("tm_estate","tm_house");
+        mpg.setStrategy(strategy);
+        mpg.execute();
+        System.out.println("代码自动生成执行完成");
     }
 }

src/main/java/fcb/project/manager/base/service/ITmEstateService.java

@@ -0,0 +1,16 @@
+package fcb.project.manager.base.service;
+
+import fcb.project.manager.base.entity.TmEstate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+public interface ITmEstateService extends IService<TmEstate> {
+
+}

src/main/java/fcb/project/manager/base/service/ITmHouseService.java

@@ -0,0 +1,16 @@
+package fcb.project.manager.base.service;
+
+import fcb.project.manager.base.entity.TmHouse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+public interface ITmHouseService extends IService<TmHouse> {
+
+}

src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -0,0 +1,20 @@
+package fcb.project.manager.base.service.impl;
+
+import fcb.project.manager.base.entity.TmEstate;
+import fcb.project.manager.base.dao.TmEstateDao;
+import fcb.project.manager.base.service.ITmEstateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Service
+public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> implements ITmEstateService {
+
+}

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -0,0 +1,20 @@
+package fcb.project.manager.base.service.impl;
+
+import fcb.project.manager.base.entity.TmHouse;
+import fcb.project.manager.base.dao.TmHouseDao;
+import fcb.project.manager.base.service.ITmHouseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-01-07
+ */
+@Service
+public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> implements ITmHouseService {
+
+}

src/main/java/fcb/project/manager/core/controller/ProjectController.java

@@ -0,0 +1,26 @@
+package fcb.project.manager.core.controller;
+
+import fdage.back.sdk.base.entity.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/7 12:16
+ * 4
+ */
+@RestController
+@RequestMapping("fcb/project")
+public class ProjectController {
+
+    @GetMapping("/queryOrSearchList")
+    public Result<Object> getProjectList(@PathVariable(required = false) String estateName,
+                                         @PathVariable(required = false) String belongCompany){
+
+
+        return Result.success("");
+    }
+
+}

src/main/resources/application.properties

@@ -9,7 +9,14 @@ swagger.page.desc=设计到房源api、楼盘项目管理、审核流程业务
 swagger.page.packagePath=fcb.project.manager
 
 
-spring.datasource.url=jdbc:mysql://8.135.107.23:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.url=jdbc:mysql://8.135.107.23:31306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.username=root
+#spring.datasource.password=4DAGE168!a
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.username=root
-spring.datasource.password=4DAGE168!a
-spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource.password=4dkk2020test%"
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0

src/main/resources/mybatis/mappers/TmEstateMapper.xml

@@ -0,0 +1,5 @@
+<?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="fcb.project.manager.base.dao.TmEstateDao">
+
+</mapper>

src/main/resources/mybatis/mappers/TmHouseMapper.xml

@@ -0,0 +1,5 @@
+<?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="fcb.project.manager.base.dao.TmHouseDao">
+
+</mapper>