gongdecai 2 years ago
parent
commit
1596ebe232

+ 63 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IKouzhaoInfoService.java

@@ -0,0 +1,63 @@
+package com.iotechn.unimall.admin.api.market;
+
+
+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.market.KouzhaoInfo;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 口罩信息Service接口
+ * 
+ * @author jlb
+ * @date 2022-09-06
+ */
+@HttpOpenApi(group = "admin.kouzhao.kouzhaoInfo", description = "口罩信息")
+public interface IKouzhaoInfoService{
+	@HttpMethod(description = "新增", permission = "admin:kouzhao:kouzhaoInfo:add", permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public Boolean add(@NotNull @HttpParam(name = "kouzhaoInfo", type = HttpParamType.COMMON, description = "口罩信息") KouzhaoInfo kouzhaoInfo,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:kouzhao:kouzhaoInfo:list",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public Page<KouzhaoInfo> list(
+								@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "numberOrder", type = HttpParamType.COMMON, description = "编号") String numberOrder,
+							@HttpParam(name = "name", type = HttpParamType.COMMON, description = "昵称") String name,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "电话") String phone,
+							@HttpParam(name = "shejiUrl", type = HttpParamType.COMMON, description = "设计图地址") String shejiUrl,
+							@HttpParam(name = "lituUrl", type = HttpParamType.COMMON, description = "例图地址") String lituUrl,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+					@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:kouzhao:kouzhaoInfo:delete",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:kouzhao:kouzhaoInfo:update",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public Boolean update(@NotNull @HttpParam(name = "kouzhaoInfo", type = HttpParamType.COMMON, description = "口罩信息") KouzhaoInfo kouzhaoInfo,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:kouzhao:kouzhaoInfo:get",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public KouzhaoInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:kouzhao:kouzhaoInfo:export",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	public String export(
+								@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "numberOrder", type = HttpParamType.COMMON, description = "编号") String numberOrder,
+							@HttpParam(name = "name", type = HttpParamType.COMMON, description = "昵称") String name,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "电话") String phone,
+							@HttpParam(name = "shejiUrl", type = HttpParamType.COMMON, description = "设计图地址") String shejiUrl,
+							@HttpParam(name = "lituUrl", type = HttpParamType.COMMON, description = "例图地址") String lituUrl,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

+ 125 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/KouzhaoInfoServiceImpl.java

@@ -0,0 +1,125 @@
+package com.iotechn.unimall.admin.api.market.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.market.IKouzhaoInfoService;
+import com.iotechn.unimall.data.domain.market.KouzhaoInfo;
+import com.iotechn.unimall.data.mapper.market.KouzhaoInfoMapper;
+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.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 口罩信息Service业务层处理
+ *
+ * @author jlb
+ * @date 2022-09-06
+ */
+@Service
+public class KouzhaoInfoServiceImpl implements IKouzhaoInfoService {
+    @Autowired
+    private KouzhaoInfoMapper kouzhaoInfoMapper;
+
+    @Override
+    public Boolean add(KouzhaoInfo kouzhaoInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        kouzhaoInfo.setGmtCreate(now);
+        kouzhaoInfo.setGmtUpdate(now);
+        return kouzhaoInfoMapper.insert(kouzhaoInfo) > 0;
+    }
+
+    @Override
+    public Page<KouzhaoInfo> list(Long userId, String numberOrder, String name, String phone, String shejiUrl, String lituUrl, Date gmtUpdate, Date gmtCreate, Integer page, Integer limit) throws ServiceException {
+        Wrapper<KouzhaoInfo> wrapper = new EntityWrapper<KouzhaoInfo>();
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(numberOrder)) {
+            wrapper.eq("number_order", numberOrder);
+        }
+        if (!StringUtils.isEmpty(name)) {
+            wrapper.eq("name", name);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(shejiUrl)) {
+            wrapper.eq("sheji_url", shejiUrl);
+        }
+        if (!StringUtils.isEmpty(lituUrl)) {
+            wrapper.eq("litu_url", lituUrl);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<KouzhaoInfo> list = kouzhaoInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = kouzhaoInfoMapper.selectCount(wrapper);
+        return new Page<KouzhaoInfo>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        kouzhaoInfoMapper.deleteById(id);
+        return true;
+    }
+
+    @Override
+    public Boolean update(KouzhaoInfo kouzhaoInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        kouzhaoInfo.setGmtUpdate(now);
+        return kouzhaoInfoMapper.updateById(kouzhaoInfo) > 0;
+    }
+
+    @Override
+    public KouzhaoInfo get(Long id) throws ServiceException {
+        return kouzhaoInfoMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long userId, String numberOrder, String name, String phone, String shejiUrl, String lituUrl, Date gmtUpdate, Date gmtCreate, Integer page, Integer limit) throws ServiceException {
+        Wrapper<KouzhaoInfo> wrapper = new EntityWrapper<KouzhaoInfo>();
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(numberOrder)) {
+            wrapper.eq("number_order", numberOrder);
+        }
+        if (!StringUtils.isEmpty(name)) {
+            wrapper.eq("name", name);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(shejiUrl)) {
+            wrapper.eq("sheji_url", shejiUrl);
+        }
+        if (!StringUtils.isEmpty(lituUrl)) {
+            wrapper.eq("litu_url", lituUrl);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        List<KouzhaoInfo> list = kouzhaoInfoMapper.selectList(wrapper);
+        ExcelUtil<KouzhaoInfo> util = new ExcelUtil<KouzhaoInfo>(KouzhaoInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

+ 73 - 0
unimall-admin/src/api/kouzhao/kouzhaoInfo.js

@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 查询口罩信息列表
+export function listKouzhaoInfo(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'list',
+      ...query
+    }
+  })
+}
+
+// 查询口罩信息详细
+export function getKouzhaoInfo(id) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'get',
+      id: id
+    }
+  })
+}
+
+// 新增口罩信息
+export function addKouzhaoInfo(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'add',
+      kouzhaoInfo: data
+    }
+  })
+}
+
+// 修改口罩信息
+export function updateKouzhaoInfo(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'update',
+      kouzhaoInfo: data
+    }
+  })
+}
+
+// 删除口罩信息
+export function delKouzhaoInfo(id) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'delete',
+      id: id
+    }
+  })
+}
+
+// 导出口罩信息
+export function exportKouzhaoInfo(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.kouzhao.kouzhaoInfo',
+      _mt: 'export',
+      ...query
+    }
+  })
+}

+ 0 - 73
unimall-admin/src/api/market/address.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询收货地址列表
-export function listAddress(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询收货地址详细
-export function getAddress(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增收货地址
-export function addAddress(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'add',
-      marketReceivingAddress: data
-    }
-  })
-}
-
-// 修改收货地址
-export function updateAddress(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'update',
-      marketReceivingAddress: data
-    }
-  })
-}
-
-// 删除收货地址
-export function delAddress(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出收货地址
-export function exportAddress(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketReceivingAddress',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 0 - 73
unimall-admin/src/api/market/advertisement.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询广告信息列表
-export function listAdvertisement(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询广告信息详细
-export function getAdvertisement(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增广告信息
-export function addAdvertisement(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'add',
-      marketAdvertisementInfo: data
-    }
-  })
-}
-
-// 修改广告信息
-export function updateAdvertisement(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'update',
-      marketAdvertisementInfo: data
-    }
-  })
-}
-
-// 删除广告信息
-export function delAdvertisement(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出广告信息
-export function exportAdvertisement(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.market.marketAdvertisementInfo',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 0 - 73
unimall-admin/src/api/market/orderDetail.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询订单详情列表
-export function listOrderDetail(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询订单详情详细
-export function getOrderDetail(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增订单详情
-export function addOrderDetail(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'add',
-      marketOrderDetail: data
-    }
-  })
-}
-
-// 修改订单详情
-export function updateOrderDetail(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'update',
-      marketOrderDetail: data
-    }
-  })
-}
-
-// 删除订单详情
-export function delOrderDetail(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出订单详情
-export function exportOrderDetail(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderDetail',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 0 - 73
unimall-admin/src/api/market/orderInfo.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询订单信息列表
-export function listOrderInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询订单信息详细
-export function getOrderInfo(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增订单信息
-export function addOrderInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'add',
-      marketOrderInfo: data
-    }
-  })
-}
-
-// 修改订单信息
-export function updateOrderInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'update',
-      marketOrderInfo: data
-    }
-  })
-}
-
-// 删除订单信息
-export function delOrderInfo(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出订单信息
-export function exportOrderInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketOrderInfo',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 0 - 73
unimall-admin/src/api/market/prodectInfo.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询商品信息列表
-export function listProdectInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询商品信息详细
-export function getProdectInfo(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增商品信息
-export function addProdectInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'add',
-      marketProdectInfo: data
-    }
-  })
-}
-
-// 修改商品信息
-export function updateProdectInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'update',
-      marketProdectInfo: data
-    }
-  })
-}
-
-// 删除商品信息
-export function delProdectInfo(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出商品信息
-export function exportProdectInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketProdectInfo',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 0 - 73
unimall-admin/src/api/market/shopInfo.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-// 查询商店信息列表
-export function listShopInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-// 查询商店信息详细
-export function getShopInfo(id) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'get',
-      id: id
-    }
-  })
-}
-
-// 新增商店信息
-export function addShopInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'add',
-      marketShopInfo: data
-    }
-  })
-}
-
-// 修改商店信息
-export function updateShopInfo(data) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'update',
-      marketShopInfo: data
-    }
-  })
-}
-
-// 删除商店信息
-export function delShopInfo(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-// 导出商店信息
-export function exportShopInfo(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.unimall.marketShopInfo',
-      _mt: 'export',
-      ...query
-    }
-  })
-}

+ 366 - 0
unimall-admin/src/views/kouzhao/kouzhaoInfo/index.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编号" prop="numberOrder">
+        <el-input
+          v-model="queryParams.numberOrder"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="昵称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="gmtUpdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtUpdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="gmtCreate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtCreate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-permission="['kouzhao:kouzhaoInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-permission="['kouzhao:kouzhaoInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-permission="['kouzhao:kouzhaoInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-permission="['kouzhao:kouzhaoInfo:export']"
+        >导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="kouzhaoInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="" align="center" prop="userId" />
+      <el-table-column label="编号" align="center" prop="numberOrder" />
+      <el-table-column label="昵称" align="center" prop="name" />
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="设计图地址" align="center" prop="shejiUrl" />
+      <el-table-column label="例图地址" align="center" prop="lituUrl" />
+      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-permission="['kouzhao:kouzhaoInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-permission="['kouzhao:kouzhaoInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改口罩信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="编号" prop="numberOrder">
+          <el-input v-model="form.numberOrder" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="昵称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="设计图地址" prop="shejiUrl">
+          <el-input v-model="form.shejiUrl" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="例图地址" prop="lituUrl">
+          <el-input v-model="form.lituUrl" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="" prop="gmtUpdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.gmtUpdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="" prop="gmtCreate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.gmtCreate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listKouzhaoInfo, getKouzhaoInfo, delKouzhaoInfo, addKouzhaoInfo, updateKouzhaoInfo, exportKouzhaoInfo } from "@/api/kouzhao/kouzhaoInfo";
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 口罩信息表格数据
+      kouzhaoInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined,
+        numberOrder: undefined,
+        name: undefined,
+        phone: undefined,
+        shejiUrl: undefined,
+        lituUrl: undefined,
+        gmtUpdate: undefined,
+        gmtCreate: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],        gmtUpdate: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],        gmtCreate: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ]      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询口罩信息列表 */
+    getList() {
+      this.loading = true;
+      listKouzhaoInfo(this.queryParams).then(response => {
+        this.kouzhaoInfoList = response.data.data.items
+        this.total = response.data.data.count
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        userId: undefined,
+        numberOrder: undefined,
+        name: undefined,
+        phone: undefined,
+        shejiUrl: undefined,
+        lituUrl: undefined,
+        gmtUpdate: undefined,
+        gmtCreate: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加口罩信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids.join(',')
+      getKouzhaoInfo(id).then(response => {
+        this.form = response.data.data
+        this.open = true;
+        this.title = "修改口罩信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateKouzhaoInfo(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              } else {
+                this.msgError(response.msg);
+              }
+            });
+          } else {
+            addKouzhaoInfo(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              } else {
+                this.msgError(response.msg);
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids.join(',')
+      this.$confirm('是否确认删除口罩信息编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delKouzhaoInfo(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有口罩信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportKouzhaoInfo(queryParams);
+        }).then(response => {
+          this.download(response.data.data);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

+ 86 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/market/KouzhaoInfo.java

@@ -0,0 +1,86 @@
+package com.iotechn.unimall.data.domain.market;
+
+import com.iotechn.unimall.data.domain.SuperDO;
+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;
+
+/**
+ * 口罩信息对象 kouzhao_info
+ * 
+ * @author jlb
+ * @date 2022-09-06
+ */
+@Data
+@TableName("kouzhao_info")
+public class KouzhaoInfo extends SuperDO {
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    @TableField("number_order")
+    private String numberOrder;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    @TableField("name")
+    private String name;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    @TableField("phone")
+    private String phone;
+
+    /** 设计图地址 */
+    @Excel(name = "设计图地址")
+    @TableField("sheji_url")
+    private String shejiUrl;
+
+    /** 例图地址 */
+    @Excel(name = "例图地址")
+    @TableField("litu_url")
+    private String lituUrl;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("numberOrder", getNumberOrder())
+            .append("name", getName())
+            .append("phone", getPhone())
+            .append("shejiUrl", getShejiUrl())
+            .append("lituUrl", getLituUrl())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("gmtCreate", getGmtCreate())
+            .toString();
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper.market;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.market.KouzhaoInfo;
+
+/**
+ * 口罩信息Mapper接口
+ * 
+ * @author jlb
+ * @date 2022-09-06
+ */
+public interface KouzhaoInfoMapper extends BaseMapper<KouzhaoInfo>{
+
+}

+ 9 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/market/KouzhaoInfoMapper.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.kouzhao.data.mapper.kouzhao.KouzhaoInfoMapper">
+    
+
+
+</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>

+ 119 - 119
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>

+ 2 - 2
unimall-launcher/src/main/resources/application.properties

@@ -10,9 +10,9 @@ logging.level.root=info
 ###MySql (MySqlConfiguration)
 ########################################################
 spring.druid.driverClassName=com.mysql.jdbc.Driver
-spring.druid.url=jdbc:mysql://113.125.167.145/bancai?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+spring.druid.url=jdbc:mysql://106.14.75.12/bancai?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 spring.druid.username=root
-spring.druid.password=123456
+spring.druid.password=Ccj841968545
 spring.druid.maxActive=30
 spring.druid.minIdle=5
 spring.druid.maxWait=10000