Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

+package com.dsk.web.controller.customer;
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.system.service.ICustomerService;
+import com.dsk.system.service.impl.CustomerServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 客户相关
+ *
+ * @author lcl
+ * @create 2023/5/16
+ */
+@RestController
+@RequestMapping("/system/config")
+public class CustomerController extends BaseController {
+
+    @Autowired
+    private ICustomerService baseService;
+
+}

dsk-common/pom.xml

@@ -113,6 +113,15 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
         <!-- hutool工具类 -->
         <dependency>
             <groupId>cn.hutool</groupId>

dsk-system/src/main/java/com/dsk/system/domain/Customer.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户信息表(Customer)实体类
+ *
+ * @author makejava
+ * @since 2023-05-16 09:27:55
+ */
+@Data
+@TableName("customer")
+public class Customer implements Serializable {
+    private static final long serialVersionUID = 824383302173350532L;
+
+    private String customerId;
+    /**
+     * jsk企业id
+     */
+    private Integer companyId;
+    /**
+     * 客户名称（企业名称）
+     */
+    private String companyName;
+    /**
+     * 法定代表人
+     */
+    private String legalPerson;
+    /**
+     * 注册资本(字符串)
+     */
+    private String registerCapitalStr;
+    /**
+     * 注册资本
+     */
+    private Double registerCapital;
+    /**
+     * 企业性质（company_nature_type）
+     */
+    private String companyNature;
+    /**
+     * 企业级别（company_level_type）
+     */
+    private String companyLevel;
+    /**
+     * 信用等级（credit_level_type）
+     */
+    private String creditLevel;
+    /**
+     * 上级公司（控股单位）
+     */
+    private String superCompany;
+    /**
+     * 是否上市 0：否 1：是
+     */
+    private Integer isOn;
+    /**
+     * 是否主要客户 0：否 1：是
+     */
+    private Integer isMajor;
+    /**
+     * 发包属性
+     */
+    private String companyAttribute;
+    /**
+     * 主要业务
+     */
+    private String mainBusiness;
+    /**
+     * 经营范围
+     */
+    private String businessScope;
+    /**
+     * 最后跟进时间
+     */
+    private Date lastFollowTime;
+
+    private Long createId;
+
+    private Date createTime;
+
+    private Long updateId;
+
+    private Date updateTime;
+
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.Customer;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 客户信息表(Customer)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-05-16 09:28:00
+ */
+@Mapper
+public interface CustomerMapper extends BaseMapper<Customer> {
+
+}
+

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

+package com.dsk.system.service;
+
+
+import com.dsk.system.domain.Customer;
+
+import java.util.List;
+
+/**
+ * 客户信息表(Customer)表服务接口
+ *
+ * @author makejava
+ * @since 2023-05-16 09:28:00
+ */
+public interface ICustomerService {
+
+}

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

+package com.dsk.system.service.impl;
+
+import com.dsk.system.mapper.CustomerMapper;
+import com.dsk.system.service.ICustomerService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 客户信息表(Customer)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-05-16 09:27:57
+ */
+@Service
+public class CustomerServiceImpl implements ICustomerService {
+
+    @Resource
+    private CustomerMapper customerMapper;
+
+}

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

+<?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.dsk.system.mapper.CustomerMapper">
+
+    <resultMap type="com.dsk.system.domain.Customer" id="CustomerMap">
+        <result property="customerId" column="customer_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="INTEGER"/>
+        <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+        <result property="legalPerson" column="legal_person" jdbcType="VARCHAR"/>
+        <result property="registerCapitalStr" column="register_capital_str" jdbcType="VARCHAR"/>
+        <result property="registerCapital" column="register_capital" jdbcType="NUMERIC"/>
+        <result property="companyNature" column="company_nature" jdbcType="VARCHAR"/>
+        <result property="companyLevel" column="company_level" jdbcType="VARCHAR"/>
+        <result property="creditLevel" column="credit_level" jdbcType="VARCHAR"/>
+        <result property="superCompany" column="super_company" jdbcType="VARCHAR"/>
+        <result property="isOn" column="is_on" jdbcType="INTEGER"/>
+        <result property="isMajor" column="is_major" jdbcType="INTEGER"/>
+        <result property="companyAttribute" column="company_attribute" jdbcType="VARCHAR"/>
+        <result property="mainBusiness" column="main_business" jdbcType="VARCHAR"/>
+        <result property="businessScope" column="business_scope" jdbcType="VARCHAR"/>
+        <result property="lastFollowTime" column="last_follow_time" jdbcType="TIMESTAMP"/>
+        <result property="createId" column="create_id" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateId" column="update_id" jdbcType="INTEGER"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+
+</mapper>
+

pom.xml

@@ -29,7 +29,7 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.20</lombok.version>
         <hutool-all.version>5.8.0</hutool-all.version>
         <dsk-openapi-sdk.version>2.1.0</dsk-openapi-sdk.version>
     </properties>
@@ -178,11 +178,16 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-extension</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
-                <scope>provided</scope>
             </dependency>
 
         </dependencies>