feat：企业注入

pom.xml

@@ -215,6 +215,7 @@
         <module>zhiLian-visual</module>
         <module>zhiLian-modules</module>
         <module>zhiLian-common</module>
+        <module>zhiLian-business</module>
     </modules>
     <packaging>pom</packaging>
 

zhiLian-business/pom.xml

@@ -0,0 +1,113 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.zhiLian</groupId>
+        <artifactId>zhiLian-server</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>zhiLian-business</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <description>
+        zhiLian-business系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- ZhiLian Common DataSource -->
+        <dependency>
+            <groupId>com.zhiLian</groupId>
+            <artifactId>zhiLian-common-datasource</artifactId>
+        </dependency>
+
+        <!-- ZhiLian Common DataScope -->
+        <dependency>
+            <groupId>com.zhiLian</groupId>
+            <artifactId>zhiLian-common-datascope</artifactId>
+        </dependency>
+
+        <!-- ZhiLian Common Log -->
+        <dependency>
+            <groupId>com.zhiLian</groupId>
+            <artifactId>zhiLian-common-log</artifactId>
+        </dependency>
+
+        <!-- ZhiLian Common Swagger -->
+        <dependency>
+            <groupId>com.zhiLian</groupId>
+            <artifactId>zhiLian-common-swagger</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

zhiLian-business/src/main/java/com/zhiLian/business/ZhiLianBusinessApplication.java

@@ -0,0 +1,26 @@
+package com.zhiLian.business;
+
+
+import com.zhiLian.common.security.annotation.EnableCustomConfig;
+import com.zhiLian.common.security.annotation.EnableMyFeignClients;
+import com.zhiLian.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName ZhiLianBusinessApplication
+ * @Date 2024/05/26 15:00
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class ZhiLianBusinessApplication {
+    public static void main (String[] args) {
+        SpringApplication.run(ZhiLianBusinessApplication.class, args);
+    }
+
+}

zhiLian-business/src/main/java/com/zhiLian/business/controller/BusinessController.java

@@ -0,0 +1,104 @@
+package com.zhiLian.business.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.zhiLian.business.domain.Business;
+import com.zhiLian.business.service.IBusinessService;
+import com.zhiLian.common.core.domain.Result;
+import com.zhiLian.common.core.utils.poi.ExcelUtil;
+import com.zhiLian.common.core.web.controller.BaseController;
+import com.zhiLian.common.core.web.page.TableDataInfo;
+import com.zhiLian.common.log.annotation.Log;
+import com.zhiLian.common.log.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 企业Controller
+ *
+ * @author muyu
+ * @date 2024-05-26
+ */
+@RestController
+@RequestMapping("/business")
+public class BusinessController extends BaseController
+{
+    @Autowired
+    private IBusinessService businessService;
+
+    /**
+     * 查询企业列表
+     */
+//    @RequiresPermissions("system:business:list")
+    @GetMapping("/list")
+    public Result<TableDataInfo<Business>> list(Business business)
+    {
+        startPage();
+        List<Business> list = businessService.selectBusinessList(business);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出企业列表
+     */
+//    @RequiresPermissions("system:business:export")
+    @Log(title = "企业", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Business business)
+    {
+        List<Business> list = businessService.selectBusinessList(business);
+        ExcelUtil<Business> util = new ExcelUtil<Business>(Business.class);
+        util.exportExcel(response, list, "企业数据");
+    }
+
+    /**
+     * 获取企业详细信息
+     */
+//    @RequiresPermissions("system:business:query")
+    @GetMapping(value = "/{id}")
+    public Result getInfo(@PathVariable("id") Long id)
+    {
+        return success(businessService.selectBusinessById(id));
+    }
+
+    /**
+     * 新增企业
+     */
+//    @RequiresPermissions("system:business:add")
+    @Log(title = "企业", businessType = BusinessType.INSERT)
+    @PostMapping
+    public Result add(@RequestBody Business business)
+    {
+        return toAjax(businessService.insertBusiness(business));
+    }
+
+    /**
+     * 修改企业
+     */
+//    @RequiresPermissions("system:business:edit")
+    @Log(title = "企业", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public Result edit(@RequestBody Business business)
+    {
+        return toAjax(businessService.updateBusiness(business));
+    }
+
+    /**
+     * 删除企业
+     */
+//    @RequiresPermissions("system:business:remove")
+    @Log(title = "企业", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public Result remove(@PathVariable Long[] ids)
+    {
+        return toAjax(businessService.deleteBusinessByIds(ids));
+    }
+}

zhiLian-business/src/main/java/com/zhiLian/business/domain/Business.java

@@ -0,0 +1,79 @@
+package com.zhiLian.business.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhiLian.common.core.annotation.Excel;
+import com.zhiLian.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 企业对象 business
+ *
+ * @author muyu
+ * @date 2024-05-26
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("business")
+public class Business extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 企业主键 */
+    @Excel(name = "企业主键")
+    private Long id;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String name;
+
+    /** 企业法定代表人 */
+    @Excel(name = "企业法定代表人")
+    private String businessPerson;
+
+    /** 营业编码 */
+    @Excel(name = "营业编码")
+    private String businessLincenseNumber;
+
+    /** 企业创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "企业创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date businessCreateTime;
+
+    /** 企业电话 */
+    @Excel(name = "企业电话")
+    private String businessPhone;
+
+    /** 企业邮箱 */
+    @Excel(name = "企业邮箱")
+    private String businessEmail;
+
+    /** 企业状态 */
+    @Excel(name = "企业状态")
+    private String businessStates;
+
+    /** 入驻车联网平台时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入驻车联网平台时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date businessRegistrationDate;
+
+    /** 服务等级0/1/2 */
+    @Excel(name = "服务等级0/1/2")
+    private String serviceLevel;
+
+    /** 认证等级0/1 */
+    @Excel(name = "认证等级0/1")
+    private String authentication;
+
+}

zhiLian-business/src/main/java/com/zhiLian/business/mapper/BusinessMapper.java

@@ -0,0 +1,63 @@
+package com.zhiLian.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiLian.business.domain.Business;
+
+import java.util.List;
+
+/**
+ * 企业Mapper接口
+ *
+ * @author muyu
+ * @date 2024-05-26
+ */
+public interface BusinessMapper extends BaseMapper<Business>
+{
+    /**
+     * 查询企业
+     *
+     * @param id 企业主键
+     * @return 企业
+     */
+    public Business selectBusinessById(Long id);
+
+    /**
+     * 查询企业列表
+     *
+     * @param business 企业
+     * @return 企业集合
+     */
+    public List<Business> selectBusinessList(Business business);
+
+    /**
+     * 新增企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    public int insertBusiness(Business business);
+
+    /**
+     * 修改企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    public int updateBusiness(Business business);
+
+    /**
+     * 删除企业
+     *
+     * @param id 企业主键
+     * @return 结果
+     */
+    public int deleteBusinessById(Long id);
+
+    /**
+     * 批量删除企业
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessByIds(Long[] ids);
+}

zhiLian-business/src/main/java/com/zhiLian/business/service/IBusinessService.java

@@ -0,0 +1,63 @@
+package com.zhiLian.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiLian.business.domain.Business;
+
+import java.util.List;
+
+/**
+ * 企业Service接口
+ *
+ * @author muyu
+ * @date 2024-05-26
+ */
+public interface IBusinessService extends IService<Business>
+{
+    /**
+     * 查询企业
+     *
+     * @param id 企业主键
+     * @return 企业
+     */
+    public Business selectBusinessById(Long id);
+
+    /**
+     * 查询企业列表
+     *
+     * @param business 企业
+     * @return 企业集合
+     */
+    public List<Business> selectBusinessList(Business business);
+
+    /**
+     * 新增企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    public int insertBusiness(Business business);
+
+    /**
+     * 修改企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    public int updateBusiness(Business business);
+
+    /**
+     * 批量删除企业
+     *
+     * @param ids 需要删除的企业主键集合
+     * @return 结果
+     */
+    public int deleteBusinessByIds(Long[] ids);
+
+    /**
+     * 删除企业信息
+     *
+     * @param id 企业主键
+     * @return 结果
+     */
+    public int deleteBusinessById(Long id);
+}

zhiLian-business/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhiLian.business.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiLian.business.domain.Business;
+import com.zhiLian.business.mapper.BusinessMapper;
+import com.zhiLian.business.service.IBusinessService;
+import com.zhiLian.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 企业Service业务层处理
+ *
+ * @author muyu
+ * @date 2024-05-26
+ */
+@Service
+public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
+        implements IBusinessService
+{
+    @Autowired
+    private BusinessMapper businessMapper;
+
+    /**
+     * 查询企业
+     *
+     * @param id 企业主键
+     * @return 企业
+     */
+    @Override
+    public Business selectBusinessById(Long id)
+    {
+        return businessMapper.selectBusinessById(id);
+    }
+
+    /**
+     * 查询企业列表
+     *
+     * @param business 企业
+     * @return 企业
+     */
+    @Override
+    public List<Business> selectBusinessList(Business business)
+    {
+        return businessMapper.selectBusinessList(business);
+    }
+
+    /**
+     * 新增企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    @Override
+    public int insertBusiness(Business business)
+    {
+        business.setCreateTime(DateUtils.getNowDate());
+        return businessMapper.insertBusiness(business);
+    }
+
+    /**
+     * 修改企业
+     *
+     * @param business 企业
+     * @return 结果
+     */
+    @Override
+    public int updateBusiness(Business business)
+    {
+        business.setUpdateTime(DateUtils.getNowDate());
+        return businessMapper.updateBusiness(business);
+    }
+
+    /**
+     * 批量删除企业
+     *
+     * @param ids 需要删除的企业主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessByIds(Long[] ids)
+    {
+        return businessMapper.deleteBusinessByIds(ids);
+    }
+
+    /**
+     * 删除企业信息
+     *
+     * @param id 企业主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessById(Long id)
+    {
+        return businessMapper.deleteBusinessById(id);
+    }
+}

zhiLian-business/src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}

zhiLian-business/src/main/resources/bootstrap.yml

@@ -0,0 +1,32 @@
+# Tomcat
+server:
+  port: 9211
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: zhiLian-business
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 111.229.102.61:8848
+        # 命名空间
+        namespace: zhiLian
+      config:
+        # 配置中心地址
+        server-addr: 111.229.102.61:8848
+        # 命名空间
+        namespace: zhiLian
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.zhiLian.business.mapper: DEBUG

zhiLian-business/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/zhiLian-business"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.zhiLian" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

zhiLian-business/src/main/resources/mapper/business/BusinessMapper.xml

@@ -0,0 +1,121 @@
+<?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.zhiLian.business.mapper.BusinessMapper">
+
+    <resultMap type="com.zhiLian.business.domain.Business" id="BusinessResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="businessPerson"    column="business_person"    />
+        <result property="businessLincenseNumber"    column="business_lincense_number"    />
+        <result property="businessCreateTime"    column="business_create_time"    />
+        <result property="businessPhone"    column="business_phone"    />
+        <result property="businessEmail"    column="business_email"    />
+        <result property="businessStates"    column="business_states"    />
+        <result property="businessRegistrationDate"    column="business_registration_date"    />
+        <result property="serviceLevel"    column="service_level"    />
+        <result property="authentication"    column="authentication"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectBusinessVo">
+        select id, name, business_person, business_lincense_number, business_create_time, business_phone, business_email, business_states, business_registration_date, service_level, authentication, remark, create_by, create_time, update_by, update_time from business
+    </sql>
+
+    <select id="selectBusinessList" parameterType="com.zhiLian.business.domain.Business" resultMap="BusinessResult">
+        <include refid="selectBusinessVo"/>
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="businessPerson != null  and businessPerson != ''"> and business_person = #{businessPerson}</if>
+            <if test="businessLincenseNumber != null  and businessLincenseNumber != ''"> and business_lincense_number = #{businessLincenseNumber}</if>
+            <if test="businessCreateTime != null "> and business_create_time = #{businessCreateTime}</if>
+            <if test="businessPhone != null  and businessPhone != ''"> and business_phone = #{businessPhone}</if>
+            <if test="businessEmail != null  and businessEmail != ''"> and business_email = #{businessEmail}</if>
+            <if test="businessStates != null  and businessStates != ''"> and business_states = #{businessStates}</if>
+            <if test="businessRegistrationDate != null "> and business_registration_date = #{businessRegistrationDate}</if>
+            <if test="serviceLevel != null  and serviceLevel != ''"> and service_level = #{serviceLevel}</if>
+            <if test="authentication != null  and authentication != ''"> and authentication = #{authentication}</if>
+        </where>
+    </select>
+
+    <select id="selectBusinessById" parameterType="Long" resultMap="BusinessResult">
+        <include refid="selectBusinessVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBusiness" parameterType="com.zhiLian.business.domain.Business" useGeneratedKeys="true" keyProperty="id">
+        insert into business
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="businessPerson != null">business_person,</if>
+            <if test="businessLincenseNumber != null">business_lincense_number,</if>
+            <if test="businessCreateTime != null">business_create_time,</if>
+            <if test="businessPhone != null">business_phone,</if>
+            <if test="businessEmail != null">business_email,</if>
+            <if test="businessStates != null">business_states,</if>
+            <if test="businessRegistrationDate != null">business_registration_date,</if>
+            <if test="serviceLevel != null">service_level,</if>
+            <if test="authentication != null">authentication,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="businessPerson != null">#{businessPerson},</if>
+            <if test="businessLincenseNumber != null">#{businessLincenseNumber},</if>
+            <if test="businessCreateTime != null">#{businessCreateTime},</if>
+            <if test="businessPhone != null">#{businessPhone},</if>
+            <if test="businessEmail != null">#{businessEmail},</if>
+            <if test="businessStates != null">#{businessStates},</if>
+            <if test="businessRegistrationDate != null">#{businessRegistrationDate},</if>
+            <if test="serviceLevel != null">#{serviceLevel},</if>
+            <if test="authentication != null">#{authentication},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBusiness" parameterType="com.zhiLian.business.domain.Business">
+        update business
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="businessPerson != null">business_person = #{businessPerson},</if>
+            <if test="businessLincenseNumber != null">business_lincense_number = #{businessLincenseNumber},</if>
+            <if test="businessCreateTime != null">business_create_time = #{businessCreateTime},</if>
+            <if test="businessPhone != null">business_phone = #{businessPhone},</if>
+            <if test="businessEmail != null">business_email = #{businessEmail},</if>
+            <if test="businessStates != null">business_states = #{businessStates},</if>
+            <if test="businessRegistrationDate != null">business_registration_date = #{businessRegistrationDate},</if>
+            <if test="serviceLevel != null">service_level = #{serviceLevel},</if>
+            <if test="authentication != null">authentication = #{authentication},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessById" parameterType="Long">
+        delete from business where id = #{id}
+    </delete>
+
+    <delete id="deleteBusinessByIds" parameterType="String">
+        delete from business where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/web/domain/BaseEntity.java

@@ -26,12 +26,12 @@ import java.util.Map;
 public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
+//    /**
-     * 搜索值
+//     * 搜索值
-     */
+//     */
-    @JsonIgnore
+//    @JsonIgnore
-    @TableField(exist = false)
+//    @TableField(exist = false)
-    private String searchValue;
+//    private String searchValue;
 
     /**
      * 创建者

zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/domain/SysUser.java

@@ -85,6 +85,11 @@ public class SysUser extends BaseEntity {
      */
     private String password;
 
+    /**
+     * 用户类型（00系统用户）
+     */
+    private String userType;
+
     /**
      * 帐号状态（0正常 1停用）
      */
@@ -323,6 +328,7 @@ public class SysUser extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("dept", getDept())
+                .append("userType",userType)
                 .toString();
     }
 }

zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -9,6 +9,7 @@
         <result property="deptId" column="dept_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
+        <result property="userType" column="user_type"/>
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
@@ -56,6 +57,7 @@
                u.phonenumber,
                u.password,
                u.sex,
+               u.user_type,
                u.status,
                u.del_flag,
                u.login_ip,
@@ -83,7 +85,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="com.zhiLian.common.system.domain.SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id, u.nick_name, u.user_type,u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
         u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -115,7 +117,7 @@
     </select>
 
     <select id="selectAllocatedList" parameterType="com.zhiLian.common.system.domain.SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id,u.user_type, u.user_name,u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -132,7 +134,7 @@
     </select>
 
     <select id="selectUnallocatedList" parameterType="com.zhiLian.common.system.domain.SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id, u.user_name,u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id