gongdecai 1 éve
szülő
commit
effdd80b39

+ 67 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/IServiceMangerTypeColorService.java

@@ -0,0 +1,67 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.data.domain.ServiceMangerTypeColor;
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 服务颜色Service接口
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+@HttpOpenApi(group = "admin.unimall.serviceMangerTypeColor", description = "服务颜色")
+public interface IServiceMangerTypeColorService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:serviceMangerTypeColor:add", permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public Boolean add(@NotNull @HttpParam(name = "serviceMangerTypeColor", type = HttpParamType.COMMON, description = "服务颜色") ServiceMangerTypeColor serviceMangerTypeColor,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:serviceMangerTypeColor:list",permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public Page<ServiceMangerTypeColor> list(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "color", type = HttpParamType.COMMON, description = "服务颜色") String color,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0:否(默认) 1:是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:serviceMangerTypeColor:delete",permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:serviceMangerTypeColor:update",permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public Boolean update(@NotNull @HttpParam(name = "serviceMangerTypeColor", type = HttpParamType.COMMON, description = "服务颜色") ServiceMangerTypeColor serviceMangerTypeColor,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:serviceMangerTypeColor:get",permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public ServiceMangerTypeColor get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:serviceMangerTypeColor:export",permissionParentName = "宠物管理", permissionName = "服务颜色管理")
+	public String export(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "color", type = HttpParamType.COMMON, description = "服务颜色") String color,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0:否(默认) 1:是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

+ 67 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/IServiceMangerTypeService.java

@@ -0,0 +1,67 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.ServiceMangerType;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 服务分类Service接口
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+@HttpOpenApi(group = "admin.unimall.serviceMangerType", description = "服务分类")
+public interface IServiceMangerTypeService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:serviceMangerType:add", permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public Boolean add(@NotNull @HttpParam(name = "serviceMangerType", type = HttpParamType.COMMON, description = "服务分类") ServiceMangerType serviceMangerType,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:serviceMangerType:list",permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public Page<ServiceMangerType> list(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "type", type = HttpParamType.COMMON, description = "服务分类") String type,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0:否(默认) 1:是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:serviceMangerType:delete",permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:serviceMangerType:update",permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public Boolean update(@NotNull @HttpParam(name = "serviceMangerType", type = HttpParamType.COMMON, description = "服务分类") ServiceMangerType serviceMangerType,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:serviceMangerType:get",permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public ServiceMangerType get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:serviceMangerType:export",permissionParentName = "宠物管理", permissionName = "服务分类管理")
+	public String export(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "type", type = HttpParamType.COMMON, description = "服务分类") String type,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0:否(默认) 1:是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

+ 146 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/ServiceMangerTypeColorServiceImpl.java

@@ -0,0 +1,146 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.huiyuan.IServiceMangerTypeColorService;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.mapper.ServiceMangerTypeColorMapper;
+import com.iotechn.unimall.data.domain.ServiceMangerTypeColor;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 服务颜色Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-03-01
+ */
+@Service
+public class ServiceMangerTypeColorServiceImpl implements IServiceMangerTypeColorService {
+    @Autowired
+    private ServiceMangerTypeColorMapper serviceMangerTypeColorMapper;
+
+    @Override
+    public Boolean add(ServiceMangerTypeColor serviceMangerTypeColor, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceMangerTypeColor.setGmtCreate(now);
+        serviceMangerTypeColor.setGmtUpdate(now);
+        serviceMangerTypeColor.setAdminId(adminId);
+        return serviceMangerTypeColorMapper.insert(serviceMangerTypeColor) > 0;
+    }
+
+    @Override
+    public Page<ServiceMangerTypeColor> list(Long companyId, String color, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceMangerTypeColor> wrapper = new EntityWrapper<ServiceMangerTypeColor>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(color)) {
+            wrapper.eq("color", color);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<ServiceMangerTypeColor> list = serviceMangerTypeColorMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = serviceMangerTypeColorMapper.selectCount(wrapper);
+        return new Page<ServiceMangerTypeColor>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            ServiceMangerTypeColor tmp = serviceMangerTypeColorMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                serviceMangerTypeColorMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(ServiceMangerTypeColor serviceMangerTypeColor, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceMangerTypeColor.setGmtUpdate(now);
+        serviceMangerTypeColor.setAdminId(adminId);
+        return serviceMangerTypeColorMapper.updateById(serviceMangerTypeColor) > 0;
+    }
+
+    @Override
+    public ServiceMangerTypeColor get(Long id) throws ServiceException {
+        return serviceMangerTypeColorMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long companyId, String color, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceMangerTypeColor> wrapper = new EntityWrapper<ServiceMangerTypeColor>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(color)) {
+            wrapper.eq("color", color);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<ServiceMangerTypeColor> list = serviceMangerTypeColorMapper.selectList(wrapper);
+        ExcelUtil<ServiceMangerTypeColor> util = new ExcelUtil<ServiceMangerTypeColor>(ServiceMangerTypeColor.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

+ 146 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/ServiceMangerTypeServiceImpl.java

@@ -0,0 +1,146 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.huiyuan.IServiceMangerTypeService;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.mapper.ServiceMangerTypeMapper;
+import com.iotechn.unimall.data.domain.ServiceMangerType;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 服务分类Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-03-01
+ */
+@Service
+public class ServiceMangerTypeServiceImpl implements IServiceMangerTypeService {
+    @Autowired
+    private ServiceMangerTypeMapper serviceMangerTypeMapper;
+
+    @Override
+    public Boolean add(ServiceMangerType serviceMangerType, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceMangerType.setGmtCreate(now);
+        serviceMangerType.setGmtUpdate(now);
+        serviceMangerType.setAdminId(adminId);
+        return serviceMangerTypeMapper.insert(serviceMangerType) > 0;
+    }
+
+    @Override
+    public Page<ServiceMangerType> list(Long companyId, String type, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceMangerType> wrapper = new EntityWrapper<ServiceMangerType>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(type)) {
+            wrapper.eq("type", type);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<ServiceMangerType> list = serviceMangerTypeMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = serviceMangerTypeMapper.selectCount(wrapper);
+        return new Page<ServiceMangerType>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            ServiceMangerType tmp = serviceMangerTypeMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                serviceMangerTypeMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(ServiceMangerType serviceMangerType, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceMangerType.setGmtUpdate(now);
+        serviceMangerType.setAdminId(adminId);
+        return serviceMangerTypeMapper.updateById(serviceMangerType) > 0;
+    }
+
+    @Override
+    public ServiceMangerType get(Long id) throws ServiceException {
+        return serviceMangerTypeMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long companyId, String type, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceMangerType> wrapper = new EntityWrapper<ServiceMangerType>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(type)) {
+            wrapper.eq("type", type);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<ServiceMangerType> list = serviceMangerTypeMapper.selectList(wrapper);
+        ExcelUtil<ServiceMangerType> util = new ExcelUtil<ServiceMangerType>(ServiceMangerType.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

+ 97 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/ServiceMangerType.java

@@ -0,0 +1,97 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 服务分类对象 service_manger_type
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+@Data
+@TableName("service_manger_type")
+public class ServiceMangerType extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 服务分类 */
+    @Excel(name = "服务分类")
+    @TableField("type")
+    private String type;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0:否(默认) 1:是 */
+    @Excel(name = "0:否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("type", getType())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

+ 97 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/ServiceMangerTypeColor.java

@@ -0,0 +1,97 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 服务颜色对象 service_manger_type_color
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+@Data
+@TableName("service_manger_type_color")
+public class ServiceMangerTypeColor extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 服务颜色 */
+    @Excel(name = "服务颜色")
+    @TableField("color")
+    private String color;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0:否(默认) 1:是 */
+    @Excel(name = "0:否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("color", getColor())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

+ 13 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/mapper/ServiceMangerTypeColorMapper.java

@@ -0,0 +1,13 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.iotechn.unimall.data.domain.ServiceMangerTypeColor;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+/**
+ * 服务颜色Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+public interface ServiceMangerTypeColorMapper extends BaseMapper<ServiceMangerTypeColor>{
+
+}

+ 14 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/mapper/ServiceMangerTypeMapper.java

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.ServiceMangerType;
+
+/**
+ * 服务分类Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-03-01
+ */
+public interface ServiceMangerTypeMapper extends BaseMapper<ServiceMangerType> {
+
+}

+ 9 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/ServiceMangerTypeColorMapper.xml

@@ -0,0 +1,9 @@
+<?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.iotechn.unimall.data.mapper.ServiceMangerTypeColorMapper">
+    
+
+
+</mapper>

+ 9 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/ServiceMangerTypeMapper.xml

@@ -0,0 +1,9 @@
+<?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.iotechn.unimall.data.mapper.ServiceMangerTypeMapper">
+    
+
+
+</mapper>

+ 54 - 54
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableColumnMapper.xml

@@ -3,59 +3,59 @@
 <mapper
 	namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableColumnMapper">
 
-<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
-<!--		<id property="columnId" column="column_id" />-->
-<!--		<result property="tableId" column="table_id" />-->
-<!--		<result property="columnName" column="column_name" />-->
-<!--		<result property="columnComment" column="column_comment" />-->
-<!--		<result property="columnType" column="column_type" />-->
-<!--		<result property="javaType" column="java_type" />-->
-<!--		<result property="javaField" column="java_field" />-->
-<!--		<result property="isPk" column="is_pk" />-->
-<!--		<result property="isIncrement" column="is_increment" />-->
-<!--		<result property="isRequired" column="is_required" />-->
-<!--		<result property="isInsert" column="is_insert" />-->
-<!--		<result property="isEdit" column="is_edit" />-->
-<!--		<result property="isList" column="is_list" />-->
-<!--		<result property="isQuery" column="is_query" />-->
-<!--		<result property="queryType" column="query_type" />-->
-<!--		<result property="htmlType" column="html_type" />-->
-<!--		<result property="dictType" column="dict_type" />-->
-<!--		<result property="sort" column="sort" />-->
-<!--		<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="selectDictTypeVo">-->
-<!--		SELECT-->
-<!--		table_id AS tableId,-->
-<!--		`table_name` AS tableName,-->
-<!--		table_comment AS tableComment,-->
-<!--		class_name AS className,-->
-<!--		tpl_category AS tplCategory,-->
-<!--		package_name AS packageName,-->
-<!--		module_name AS moduleName,-->
-<!--		business_name AS businessName,-->
-<!--		function_name AS functionName,-->
-<!--		function_author AS functionAuthor,-->
-<!--		create_by AS createBy,-->
-<!--		create_time AS createTime,-->
-<!--		update_by AS updateBy,-->
-<!--		update_time AS updateTime,-->
-<!--		`options`-->
-<!--		FROM-->
-<!--		sys_gen_table-->
-<!--	</sql>-->
-<!--	<select id="selectDbTableColumnsByName" parameterType="String" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTableColumn">-->
-<!--		select column_name as columnName, (case when (is_nullable = 'no' <![CDATA[ && ]]>-->
-<!--		column_key != 'PRI') then '1' else null end) as isRequired, (case-->
-<!--		when column_key = 'PRI' then '1' else '0' end) as isPk,-->
-<!--		ordinal_position as sort, column_comment as columnComment, (case when extra =-->
-<!--		'auto_increment' then '1' else '0' end) as isIncrement, column_type as columnType-->
-<!--		from information_schema.columns where table_schema = (select-->
-<!--		database()) and table_name = (#{tableName})-->
-<!--		order by ordinal_position-->
-<!--	</select>-->
+	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+		<id property="columnId" column="column_id" />
+		<result property="tableId" column="table_id" />
+		<result property="columnName" column="column_name" />
+		<result property="columnComment" column="column_comment" />
+		<result property="columnType" column="column_type" />
+		<result property="javaType" column="java_type" />
+		<result property="javaField" column="java_field" />
+		<result property="isPk" column="is_pk" />
+		<result property="isIncrement" column="is_increment" />
+		<result property="isRequired" column="is_required" />
+		<result property="isInsert" column="is_insert" />
+		<result property="isEdit" column="is_edit" />
+		<result property="isList" column="is_list" />
+		<result property="isQuery" column="is_query" />
+		<result property="queryType" column="query_type" />
+		<result property="htmlType" column="html_type" />
+		<result property="dictType" column="dict_type" />
+		<result property="sort" column="sort" />
+		<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="selectDictTypeVo">
+		SELECT
+		table_id AS tableId,
+		`table_name` AS tableName,
+		table_comment AS tableComment,
+		class_name AS className,
+		tpl_category AS tplCategory,
+		package_name AS packageName,
+		module_name AS moduleName,
+		business_name AS businessName,
+		function_name AS functionName,
+		function_author AS functionAuthor,
+		create_by AS createBy,
+		create_time AS createTime,
+		update_by AS updateBy,
+		update_time AS updateTime,
+		`options`
+		FROM
+		sys_gen_table
+	</sql>
+	<select id="selectDbTableColumnsByName" parameterType="String" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTableColumn">
+		select column_name as columnName, (case when (is_nullable = 'no' <![CDATA[ && ]]>
+		column_key != 'PRI') then '1' else null end) as isRequired, (case
+		when column_key = 'PRI' then '1' else '0' end) as isPk,
+		ordinal_position as sort, column_comment as columnComment, (case when extra =
+		'auto_increment' then '1' else '0' end) as isIncrement, column_type as columnType
+		from information_schema.columns where table_schema = (select
+		database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
 
 </mapper>

+ 118 - 118
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -2,124 +2,124 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableMapper">
 
-<!--	<resultMap type="GenTable" id="GenTableResult">-->
-<!--	    <id     property="tableId"        column="table_id"        />-->
-<!--		<result property="tableName"      column="table_name"      />-->
-<!--		<result property="tableComment"   column="table_comment"   />-->
-<!--		<result property="className"      column="class_name"      />-->
-<!--		<result property="tplCategory"    column="tpl_category"    />-->
-<!--		<result property="packageName"    column="package_name"    />-->
-<!--		<result property="moduleName"     column="module_name"     />-->
-<!--		<result property="businessName"   column="business_name"   />-->
-<!--		<result property="functionName"   column="function_name"   />-->
-<!--		<result property="functionAuthor" column="function_author" />-->
-<!--		<result property="options"        column="options"         />-->
-<!--		<result property="createBy"       column="create_by"       />-->
-<!--		<result property="createTime"     column="create_time"     />-->
-<!--		<result property="updateBy"       column="update_by"       />-->
-<!--		<result property="updateTime"     column="update_time"     />-->
-<!--		<result property="remark"         column="remark"          />-->
-<!--		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />-->
-<!--	</resultMap>-->
+	<resultMap type="GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"        />
+		<result property="tableName"      column="table_name"      />
+		<result property="tableComment"   column="table_comment"   />
+		<result property="className"      column="class_name"      />
+		<result property="tplCategory"    column="tpl_category"    />
+		<result property="packageName"    column="package_name"    />
+		<result property="moduleName"     column="module_name"     />
+		<result property="businessName"   column="business_name"   />
+		<result property="functionName"   column="function_name"   />
+		<result property="functionAuthor" column="function_author" />
+		<result property="options"        column="options"         />
+		<result property="createBy"       column="create_by"       />
+		<result property="createTime"     column="create_time"     />
+		<result property="updateBy"       column="update_by"       />
+		<result property="updateTime"     column="update_time"     />
+		<result property="remark"         column="remark"          />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
 
-<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
-<!--        <id     property="columnId"       column="column_id"      />-->
-<!--        <result property="tableId"        column="table_id"       />-->
-<!--        <result property="columnName"     column="column_name"    />-->
-<!--        <result property="columnComment"  column="column_comment" />-->
-<!--        <result property="columnType"     column="column_type"    />-->
-<!--        <result property="javaType"       column="java_type"      />-->
-<!--        <result property="javaField"      column="java_field"     />-->
-<!--        <result property="isPk"           column="is_pk"          />-->
-<!--        <result property="isIncrement"    column="is_increment"   />-->
-<!--        <result property="isRequired"     column="is_required"    />-->
-<!--        <result property="isInsert"       column="is_insert"      />-->
-<!--        <result property="isEdit"         column="is_edit"        />-->
-<!--        <result property="isList"         column="is_list"        />-->
-<!--        <result property="isQuery"        column="is_query"       />-->
-<!--        <result property="queryType"      column="query_type"     />-->
-<!--        <result property="htmlType"       column="html_type"      />-->
-<!--        <result property="dictType"       column="dict_type"      />-->
-<!--        <result property="sort"           column="sort"           />-->
-<!--        <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="selectDictTypeVo">-->
-<!--		SELECT-->
-<!--			table_id AS tableId,-->
-<!--			`table_name` AS tableName,-->
-<!--			table_comment AS tableComment,-->
-<!--			class_name AS className,-->
-<!--			tpl_category AS tplCategory,-->
-<!--			package_name AS packageName,-->
-<!--			module_name AS moduleName,-->
-<!--			business_name AS businessName,-->
-<!--			function_name AS functionName,-->
-<!--			function_author AS functionAuthor,-->
-<!--			create_by AS createBy,-->
-<!--			create_time AS createTime,-->
-<!--			update_by AS updateBy,-->
-<!--			update_time AS updateTime,-->
-<!--			`options`-->
-<!--		FROM-->
-<!--			sys_gen_table-->
-<!--	</sql>-->
-<!--	<select id="selectDbTableListByNames"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">-->
-<!--		SELECT-->
-<!--        table_name as tableName,-->
-<!--        table_comment as tableComment,-->
-<!--        create_time as createTime,-->
-<!--        update_time as updateTime-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--			AND table_name in-->
-<!--			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">-->
-<!--			#{item}-->
-<!--			</foreach>-->
-<!--	</select>-->
-<!--	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">-->
-<!--		SELECT-->
-<!--			table_name as tableName,-->
-<!--			table_comment as tableComment,-->
-<!--			create_time as createTime,-->
-<!--			update_time as updateTime-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--		<if test="tableName != null and tableName != ''">-->
-<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
-<!--		</if>-->
-<!--		<if test="tableComment != null and tableComment != ''">-->
-<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
-<!--		</if>-->
-<!--	</select>-->
-<!--	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">-->
-<!--		SELECT-->
-<!--			COUNT(*)-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--		<if test="tableName != null and tableName != ''">-->
-<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
-<!--		</if>-->
-<!--		<if test="tableComment != null and tableComment != ''">-->
-<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
-<!--		</if>-->
-<!--	</select>-->
+	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <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="selectDictTypeVo">
+		SELECT
+			table_id AS tableId,
+			`table_name` AS tableName,
+			table_comment AS tableComment,
+			class_name AS className,
+			tpl_category AS tplCategory,
+			package_name AS packageName,
+			module_name AS moduleName,
+			business_name AS businessName,
+			function_name AS functionName,
+			function_author AS functionAuthor,
+			create_by AS createBy,
+			create_time AS createTime,
+			update_by AS updateBy,
+			update_time AS updateTime,
+			`options`
+		FROM
+			sys_gen_table
+	</sql>
+	<select id="selectDbTableListByNames"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+		SELECT
+        table_name as tableName,
+        table_comment as tableComment,
+        create_time as createTime,
+        update_time as updateTime
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+			AND table_name in
+			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">
+			#{item}
+			</foreach>
+	</select>
+	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+		SELECT
+			table_name as tableName,
+			table_comment as tableComment,
+			create_time as createTime,
+			update_time as updateTime
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+	</select>
+	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
+		SELECT
+			COUNT(*)
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+	</select>
 <!--	-->
 </mapper>