From 954d172bf6b6e4308be02b4d67f10a26be1397ac Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 08 九月 2023 13:41:09 +0800
Subject: [PATCH] 代码生成
---
/dev/null | 90 ------
server/platform/src/main/java/com/doumee/api/business/BaseDataController.java | 90 ++++++
server/service/src/main/java/com/doumee/dao/business/model/BaseData.java | 238 +++++++++++++++++
server/platform/pom.xml | 2
server/platform/src/main/java/com/doumee/PlatformApplication.java | 1
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 268 +++++++++++++++++++
server/service/src/main/java/com/doumee/dao/business/BaseDataMapper.java | 12
server/service/src/main/java/com/doumee/service/business/BaseDataService.java | 97 ++++++
server/company/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java | 1
server/service/src/main/resources/application-dev.yml | 12
server/service/src/main/resources/application-test.yml | 2
server/platform/src/main/resources/application.yml | 5
12 files changed, 714 insertions(+), 104 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/BaseCateParamController.java b/server/company/src/main/java/com/doumee/api/business/BaseCateParamController.java
deleted file mode 100644
index 69d01c5..0000000
--- a/server/company/src/main/java/com/doumee/api/business/BaseCateParamController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.BaseCateParam;
-import com.doumee.service.business.BaseCateParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/09/07 11:41
- */
-@Api(tags = "绱犳潗搴�-鍝佺被鍙傛暟淇℃伅琛�")
-@RestController
-@RequestMapping("/business/baseCateParam")
-public class BaseCateParamController extends BaseController {
-
- @Autowired
- private BaseCateParamService baseCateParamService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:basecateparam:create")
- public ApiResponse create(@RequestBody BaseCateParam baseCateParam) {
- return ApiResponse.success(baseCateParamService.create(baseCateParam));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:basecateparam:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- baseCateParamService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:basecateparam:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- baseCateParamService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:basecateparam:update")
- public ApiResponse updateById(@RequestBody BaseCateParam baseCateParam) {
- baseCateParamService.updateById(baseCateParam);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:basecateparam:query")
- public ApiResponse<PageData<BaseCateParam>> findPage (@RequestBody PageWrap<BaseCateParam> pageWrap) {
- return ApiResponse.success(baseCateParamService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:basecateparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BaseCateParam> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BaseCateParam.class).export(baseCateParamService.findPage(pageWrap).getRecords(), "绱犳潗搴�-鍝佺被鍙傛暟淇℃伅琛�", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:basecateparam:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(baseCateParamService.findById(id));
- }
-}
diff --git a/server/company/src/main/java/com/doumee/api/business/BaseCategoryController.java b/server/company/src/main/java/com/doumee/api/business/BaseCategoryController.java
deleted file mode 100644
index 1b2d62b..0000000
--- a/server/company/src/main/java/com/doumee/api/business/BaseCategoryController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.BaseCategory;
-import com.doumee.service.business.BaseCategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/09/07 11:41
- */
-@Api(tags = "绱犳潗搴�-鍝佺被淇℃伅琛�")
-@RestController
-@RequestMapping("/business/baseCategory")
-public class BaseCategoryController extends BaseController {
-
- @Autowired
- private BaseCategoryService baseCategoryService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:basecategory:create")
- public ApiResponse create(@RequestBody BaseCategory baseCategory) {
- return ApiResponse.success(baseCategoryService.create(baseCategory));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:basecategory:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- baseCategoryService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:basecategory:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- baseCategoryService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:basecategory:update")
- public ApiResponse updateById(@RequestBody BaseCategory baseCategory) {
- baseCategoryService.updateById(baseCategory);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:basecategory:query")
- public ApiResponse<PageData<BaseCategory>> findPage (@RequestBody PageWrap<BaseCategory> pageWrap) {
- return ApiResponse.success(baseCategoryService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:basecategory:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BaseCategory> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BaseCategory.class).export(baseCategoryService.findPage(pageWrap).getRecords(), "绱犳潗搴�-鍝佺被淇℃伅琛�", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:basecategory:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(baseCategoryService.findById(id));
- }
-}
diff --git a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java b/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
deleted file mode 100644
index 61818e1..0000000
--- a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.BaseGoods;
-import com.doumee.service.business.BaseGoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/09/07 11:41
- */
-@Api(tags = "绱犳潗搴�-鍟嗗搧淇℃伅琛�")
-@RestController
-@RequestMapping("/business/baseGoods")
-public class BaseGoodsController extends BaseController {
-
- @Autowired
- private BaseGoodsService baseGoodsService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:basegoods:create")
- public ApiResponse create(@RequestBody BaseGoods baseGoods) {
- return ApiResponse.success(baseGoodsService.create(baseGoods));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:basegoods:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- baseGoodsService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:basegoods:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- baseGoodsService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:basegoods:update")
- public ApiResponse updateById(@RequestBody BaseGoods baseGoods) {
- baseGoodsService.updateById(baseGoods);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:basegoods:query")
- public ApiResponse<PageData<BaseGoods>> findPage (@RequestBody PageWrap<BaseGoods> pageWrap) {
- return ApiResponse.success(baseGoodsService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:basegoods:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BaseGoods> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BaseGoods.class).export(baseGoodsService.findPage(pageWrap).getRecords(), "绱犳潗搴�-鍟嗗搧淇℃伅琛�", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:basegoods:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(baseGoodsService.findById(id));
- }
-}
diff --git a/server/company/src/main/java/com/doumee/api/business/BaseGoodsParamController.java b/server/company/src/main/java/com/doumee/api/business/BaseGoodsParamController.java
deleted file mode 100644
index 7b230bf..0000000
--- a/server/company/src/main/java/com/doumee/api/business/BaseGoodsParamController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.BaseGoodsParam;
-import com.doumee.service.business.BaseGoodsParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/09/07 11:41
- */
-@Api(tags = "绱犳潗搴�-鍟嗗搧鍝佺被鍙傛暟閰嶇疆琛�")
-@RestController
-@RequestMapping("/business/baseGoodsParam")
-public class BaseGoodsParamController extends BaseController {
-
- @Autowired
- private BaseGoodsParamService baseGoodsParamService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:basegoodsparam:create")
- public ApiResponse create(@RequestBody BaseGoodsParam baseGoodsParam) {
- return ApiResponse.success(baseGoodsParamService.create(baseGoodsParam));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:basegoodsparam:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- baseGoodsParamService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:basegoodsparam:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- baseGoodsParamService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:basegoodsparam:update")
- public ApiResponse updateById(@RequestBody BaseGoodsParam baseGoodsParam) {
- baseGoodsParamService.updateById(baseGoodsParam);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:basegoodsparam:query")
- public ApiResponse<PageData<BaseGoodsParam>> findPage (@RequestBody PageWrap<BaseGoodsParam> pageWrap) {
- return ApiResponse.success(baseGoodsParamService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:basegoodsparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BaseGoodsParam> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BaseGoodsParam.class).export(baseGoodsParamService.findPage(pageWrap).getRecords(), "绱犳潗搴�-鍟嗗搧鍝佺被鍙傛暟閰嶇疆琛�", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:basegoodsparam:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(baseGoodsParamService.findById(id));
- }
-}
diff --git a/server/company/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java b/server/company/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java
index f67e9a8..ca3aa45 100644
--- a/server/company/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java
+++ b/server/company/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java
@@ -15,7 +15,6 @@
@Autowired
private SwaggerInterceptor swaggerInterceptor;
-
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(swaggerInterceptor).addPathPatterns("/swagger-ui.html", "/doc.html");
diff --git a/server/platform/pom.xml b/server/platform/pom.xml
index c283208..43c532f 100644
--- a/server/platform/pom.xml
+++ b/server/platform/pom.xml
@@ -8,9 +8,7 @@
<artifactId>preselect</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
<artifactId>platform</artifactId>
-
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
diff --git a/server/platform/src/main/java/com/doumee/PlatformApplication.java b/server/platform/src/main/java/com/doumee/PlatformApplication.java
index e49767a..9c7a170 100644
--- a/server/platform/src/main/java/com/doumee/PlatformApplication.java
+++ b/server/platform/src/main/java/com/doumee/PlatformApplication.java
@@ -15,7 +15,6 @@
@SpringBootApplication
@MapperScan("com.doumee.dao")
public class PlatformApplication {
-
public static void main(String[] args) {
ApplicationContext context = SpringApplication.run(PlatformApplication.class);
context.getEnvironment();
diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseDataController.java b/server/platform/src/main/java/com/doumee/api/business/BaseDataController.java
new file mode 100644
index 0000000..d52d1db
--- /dev/null
+++ b/server/platform/src/main/java/com/doumee/api/business/BaseDataController.java
@@ -0,0 +1,90 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.BaseData;
+import com.doumee.service.business.BaseDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/09/08 11:39
+ */
+@Api(tags = "鍟嗗搧婧愭暟鎹俊鎭〃")
+@RestController
+@RequestMapping("/business/baseData")
+public class BaseDataController extends BaseController {
+
+ @Autowired
+ private BaseDataService baseDataService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:basedata:create")
+ public ApiResponse create(@RequestBody BaseData baseData) {
+ return ApiResponse.success(baseDataService.create(baseData));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:basedata:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ baseDataService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:basedata:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ baseDataService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:basedata:update")
+ public ApiResponse updateById(@RequestBody BaseData baseData) {
+ baseDataService.updateById(baseData);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:basedata:query")
+ public ApiResponse<PageData<BaseData>> findPage (@RequestBody PageWrap<BaseData> pageWrap) {
+ return ApiResponse.success(baseDataService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:basedata:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<BaseData> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(BaseData.class).export(baseDataService.findPage(pageWrap).getRecords(), "鍟嗗搧婧愭暟鎹俊鎭〃", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:basedata:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(baseDataService.findById(id));
+ }
+}
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index c6d3f67..4059361 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -9,7 +9,7 @@
spring:
# application:
-# name: doumeemes
+# name: doumeemes
profiles:
active: dev
@@ -24,6 +24,7 @@
max-file-size: 200MB
max-request-size: 200MB
enabled: true
+
# MyBatis閰嶇疆
mybatis-plus:
mapper-locations: classpath*:/mappers/**/*.xml
@@ -40,14 +41,12 @@
# 楠岃瘉鐮佽繃鏈熸椂闀�(s)
expire: 300
-
# 璺熻釜鏃ュ織
trace:
# 寮�鍚櫤鑳借窡韪ā寮�
smart: true
# 鎺掗櫎璺熻釜鐨刄RL姝ｅ垯
exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
-
# 鏃ュ織閰嶇疆
logback:
diff --git a/server/service/src/main/java/com/doumee/dao/business/BaseDataMapper.java b/server/service/src/main/java/com/doumee/dao/business/BaseDataMapper.java
new file mode 100644
index 0000000..5871e92
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/BaseDataMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.BaseData;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/09/08 11:39
+ */
+public interface BaseDataMapper extends BaseMapper<BaseData> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
new file mode 100644
index 0000000..1e2cca7
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
@@ -0,0 +1,238 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 鍟嗗搧婧愭暟鎹俊鎭〃
+ * @author 姹熻箘韫�
+ * @date 2023/09/08 11:39
+ */
+@Data
+@ApiModel("鍟嗗搧婧愭暟鎹俊鎭〃")
+@TableName("`base_data`")
+public class BaseData {
+
+ @ApiModelProperty(value = "", example = "1")
+ @ExcelColumn(name="")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "鏍囬")
+ @ExcelColumn(name="鏍囬")
+ private String title;
+
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ @ExcelColumn(name="鍟嗗搧鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "浜笢sku")
+ @ExcelColumn(name="浜笢sku")
+ private String sku;
+
+ @ApiModelProperty(value = "鍝佺墝")
+ @ExcelColumn(name="鍝佺墝")
+ private String brand;
+
+ @ApiModelProperty(value = "绫诲埆")
+ @ExcelColumn(name="绫诲埆")
+ private String category;
+
+ @ApiModelProperty(value = "澶栭摼鍦板潃")
+ @ExcelColumn(name="澶栭摼鍦板潃")
+ private String url;
+
+ @ApiModelProperty(value = "鍒楄〃鍥�")
+ @ExcelColumn(name="鍒楄〃鍥�")
+ private String imgurl;
+
+ @ApiModelProperty(value = "澶у浘1")
+ @ExcelColumn(name="澶у浘1")
+ private String bgImg;
+
+ @ApiModelProperty(value = "澶у浘2")
+ @ExcelColumn(name="澶у浘2")
+ private String bgImg2;
+
+ @ApiModelProperty(value = "澶у浘3")
+ @ExcelColumn(name="澶у浘3")
+ private String bgImg3;
+
+ @ApiModelProperty(value = "浠锋牸", example = "1")
+ @ExcelColumn(name="浠锋牸")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "閲囪喘浠锋牸", example = "1")
+ @ExcelColumn(name="閲囪喘浠锋牸")
+ private BigDecimal saleprice;
+
+ @ApiModelProperty(value = "灞炴��1")
+ @ExcelColumn(name="灞炴��1")
+ private String attr1;
+
+ @ApiModelProperty(value = "灞炴��2")
+ @ExcelColumn(name="灞炴��2")
+ private String attr2;
+
+ @ApiModelProperty(value = "灞炴��3")
+ @ExcelColumn(name="灞炴��3")
+ private String attr3;
+
+ @ApiModelProperty(value = "灞炴��4")
+ @ExcelColumn(name="灞炴��4")
+ private String attr4;
+
+ @ApiModelProperty(value = "灞炴��5")
+ @ExcelColumn(name="灞炴��5")
+ private String attr5;
+
+ @ApiModelProperty(value = "灞炴��6")
+ @ExcelColumn(name="灞炴��6")
+ private String attr6;
+
+ @ApiModelProperty(value = "灞炴��7")
+ @ExcelColumn(name="灞炴��7")
+ private String attr7;
+
+ @ApiModelProperty(value = "灞炴��8")
+ @ExcelColumn(name="灞炴��8")
+ private String attr8;
+
+ @ApiModelProperty(value = "灞炴��9")
+ @ExcelColumn(name="灞炴��9")
+ private String attr9;
+
+ @ApiModelProperty(value = "灞炴��10")
+ @ExcelColumn(name="灞炴��10")
+ private String attr10;
+
+ @ApiModelProperty(value = "灞炴��11")
+ @ExcelColumn(name="灞炴��11")
+ private String attr11;
+
+ @ApiModelProperty(value = "灞炴��12")
+ @ExcelColumn(name="灞炴��12")
+ private String attr12;
+
+ @ApiModelProperty(value = "灞炴��13")
+ @ExcelColumn(name="灞炴��13")
+ private String attr13;
+
+ @ApiModelProperty(value = "灞炴��14")
+ @ExcelColumn(name="灞炴��14")
+ private String attr14;
+
+ @ApiModelProperty(value = "灞炴��15")
+ @ExcelColumn(name="灞炴��15")
+ private String attr15;
+
+ @ApiModelProperty(value = "灞炴��16")
+ @ExcelColumn(name="灞炴��16")
+ private String attr16;
+
+ @ApiModelProperty(value = "灞炴��17")
+ @ExcelColumn(name="灞炴��17")
+ private String attr17;
+
+ @ApiModelProperty(value = "灞炴��18")
+ @ExcelColumn(name="灞炴��18")
+ private String attr18;
+
+ @ApiModelProperty(value = "灞炴��19")
+ @ExcelColumn(name="灞炴��19")
+ private String attr19;
+
+ @ApiModelProperty(value = "灞炴��20")
+ @ExcelColumn(name="灞炴��20")
+ private String attr20;
+
+ @ApiModelProperty(value = "灞炴��21")
+ @ExcelColumn(name="灞炴��21")
+ private String attr21;
+
+ @ApiModelProperty(value = "灞炴��22")
+ @ExcelColumn(name="灞炴��22")
+ private String attr22;
+
+ @ApiModelProperty(value = "灞炴��23")
+ @ExcelColumn(name="灞炴��23")
+ private String attr23;
+
+ @ApiModelProperty(value = "灞炴��24")
+ @ExcelColumn(name="灞炴��24")
+ private String attr24;
+
+ @ApiModelProperty(value = "灞炴��25")
+ @ExcelColumn(name="灞炴��25")
+ private String attr25;
+
+ @ApiModelProperty(value = "灞炴��26")
+ @ExcelColumn(name="灞炴��26")
+ private String attr26;
+
+ @ApiModelProperty(value = "灞炴��27")
+ @ExcelColumn(name="灞炴��27")
+ private String attr27;
+
+ @ApiModelProperty(value = "灞炴��28")
+ @ExcelColumn(name="灞炴��28")
+ private String attr28;
+
+ @ApiModelProperty(value = "灞炴��29")
+ @ExcelColumn(name="灞炴��29")
+ private String attr29;
+
+ @ApiModelProperty(value = "灞炴��30")
+ @ExcelColumn(name="灞炴��30")
+ private String attr30;
+
+ @ApiModelProperty(value = "灞炴��31")
+ @ExcelColumn(name="灞炴��31")
+ private String attr31;
+
+ @ApiModelProperty(value = "灞炴��32")
+ @ExcelColumn(name="灞炴��32")
+ private String attr32;
+
+ @ApiModelProperty(value = "灞炴��33")
+ @ExcelColumn(name="灞炴��33")
+ private String attr33;
+
+ @ApiModelProperty(value = "灞炴��34")
+ @ExcelColumn(name="灞炴��34")
+ private String attr34;
+
+ @ApiModelProperty(value = "澶勭悊鐘舵�� 0寰呭鐞� 1宸插鐞�", example = "1")
+ @ExcelColumn(name="澶勭悊鐘舵�� 0寰呭鐞� 1宸插鐞�")
+ private Integer status;
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/BaseDataService.java b/server/service/src/main/java/com/doumee/service/business/BaseDataService.java
new file mode 100644
index 0000000..634d4c3
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/BaseDataService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.BaseData;
+import java.util.List;
+
+/**
+ * 鍟嗗搧婧愭暟鎹俊鎭〃Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/09/08 11:39
+ */
+public interface BaseDataService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(BaseData baseData);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ */
+ void delete(BaseData baseData);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ */
+ void updateById(BaseData baseData);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param baseDatas 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<BaseData> baseDatas);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return BaseData
+ */
+ BaseData findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ * @return BaseData
+ */
+ BaseData findOne(BaseData baseData);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ * @return List<BaseData>
+ */
+ List<BaseData> findList(BaseData baseData);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<BaseData>
+ */
+ PageData<BaseData> findPage(PageWrap<BaseData> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param baseData 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(BaseData baseData);
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
new file mode 100644
index 0000000..1deda52
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -0,0 +1,268 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.BaseDataMapper;
+import com.doumee.dao.business.model.BaseData;
+import com.doumee.service.business.BaseDataService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 鍟嗗搧婧愭暟鎹俊鎭〃Service瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/09/08 11:39
+ */
+@Service
+public class BaseDataServiceImpl implements BaseDataService {
+
+ @Autowired
+ private BaseDataMapper baseDataMapper;
+
+ @Override
+ public Integer create(BaseData baseData) {
+ baseDataMapper.insert(baseData);
+ return baseData.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ baseDataMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(BaseData baseData) {
+ UpdateWrapper<BaseData> deleteWrapper = new UpdateWrapper<>(baseData);
+ baseDataMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ baseDataMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(BaseData baseData) {
+ baseDataMapper.updateById(baseData);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<BaseData> baseDatas) {
+ if (CollectionUtils.isEmpty(baseDatas)) {
+ return;
+ }
+ for (BaseData baseData: baseDatas) {
+ this.updateById(baseData);
+ }
+ }
+
+ @Override
+ public BaseData findById(Integer id) {
+ return baseDataMapper.selectById(id);
+ }
+
+ @Override
+ public BaseData findOne(BaseData baseData) {
+ QueryWrapper<BaseData> wrapper = new QueryWrapper<>(baseData);
+ return baseDataMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<BaseData> findList(BaseData baseData) {
+ QueryWrapper<BaseData> wrapper = new QueryWrapper<>(baseData);
+ return baseDataMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<BaseData> findPage(PageWrap<BaseData> pageWrap) {
+ IPage<BaseData> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<BaseData> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(BaseData::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(BaseData::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(BaseData::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(BaseData::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(BaseData::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(BaseData::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(BaseData::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(BaseData::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getTitle() != null) {
+ queryWrapper.lambda().eq(BaseData::getTitle, pageWrap.getModel().getTitle());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(BaseData::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getSku() != null) {
+ queryWrapper.lambda().eq(BaseData::getSku, pageWrap.getModel().getSku());
+ }
+ if (pageWrap.getModel().getBrand() != null) {
+ queryWrapper.lambda().eq(BaseData::getBrand, pageWrap.getModel().getBrand());
+ }
+ if (pageWrap.getModel().getCategory() != null) {
+ queryWrapper.lambda().eq(BaseData::getCategory, pageWrap.getModel().getCategory());
+ }
+ if (pageWrap.getModel().getUrl() != null) {
+ queryWrapper.lambda().eq(BaseData::getUrl, pageWrap.getModel().getUrl());
+ }
+ if (pageWrap.getModel().getImgurl() != null) {
+ queryWrapper.lambda().eq(BaseData::getImgurl, pageWrap.getModel().getImgurl());
+ }
+ if (pageWrap.getModel().getBgImg() != null) {
+ queryWrapper.lambda().eq(BaseData::getBgImg, pageWrap.getModel().getBgImg());
+ }
+ if (pageWrap.getModel().getBgImg2() != null) {
+ queryWrapper.lambda().eq(BaseData::getBgImg2, pageWrap.getModel().getBgImg2());
+ }
+ if (pageWrap.getModel().getBgImg3() != null) {
+ queryWrapper.lambda().eq(BaseData::getBgImg3, pageWrap.getModel().getBgImg3());
+ }
+ if (pageWrap.getModel().getPrice() != null) {
+ queryWrapper.lambda().eq(BaseData::getPrice, pageWrap.getModel().getPrice());
+ }
+ if (pageWrap.getModel().getSaleprice() != null) {
+ queryWrapper.lambda().eq(BaseData::getSaleprice, pageWrap.getModel().getSaleprice());
+ }
+ if (pageWrap.getModel().getAttr1() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr1, pageWrap.getModel().getAttr1());
+ }
+ if (pageWrap.getModel().getAttr2() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr2, pageWrap.getModel().getAttr2());
+ }
+ if (pageWrap.getModel().getAttr3() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr3, pageWrap.getModel().getAttr3());
+ }
+ if (pageWrap.getModel().getAttr4() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr4, pageWrap.getModel().getAttr4());
+ }
+ if (pageWrap.getModel().getAttr5() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr5, pageWrap.getModel().getAttr5());
+ }
+ if (pageWrap.getModel().getAttr6() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr6, pageWrap.getModel().getAttr6());
+ }
+ if (pageWrap.getModel().getAttr7() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr7, pageWrap.getModel().getAttr7());
+ }
+ if (pageWrap.getModel().getAttr8() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr8, pageWrap.getModel().getAttr8());
+ }
+ if (pageWrap.getModel().getAttr9() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr9, pageWrap.getModel().getAttr9());
+ }
+ if (pageWrap.getModel().getAttr10() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr10, pageWrap.getModel().getAttr10());
+ }
+ if (pageWrap.getModel().getAttr11() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr11, pageWrap.getModel().getAttr11());
+ }
+ if (pageWrap.getModel().getAttr12() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr12, pageWrap.getModel().getAttr12());
+ }
+ if (pageWrap.getModel().getAttr13() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr13, pageWrap.getModel().getAttr13());
+ }
+ if (pageWrap.getModel().getAttr14() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr14, pageWrap.getModel().getAttr14());
+ }
+ if (pageWrap.getModel().getAttr15() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr15, pageWrap.getModel().getAttr15());
+ }
+ if (pageWrap.getModel().getAttr16() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr16, pageWrap.getModel().getAttr16());
+ }
+ if (pageWrap.getModel().getAttr17() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr17, pageWrap.getModel().getAttr17());
+ }
+ if (pageWrap.getModel().getAttr18() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr18, pageWrap.getModel().getAttr18());
+ }
+ if (pageWrap.getModel().getAttr19() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr19, pageWrap.getModel().getAttr19());
+ }
+ if (pageWrap.getModel().getAttr20() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr20, pageWrap.getModel().getAttr20());
+ }
+ if (pageWrap.getModel().getAttr21() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr21, pageWrap.getModel().getAttr21());
+ }
+ if (pageWrap.getModel().getAttr22() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr22, pageWrap.getModel().getAttr22());
+ }
+ if (pageWrap.getModel().getAttr23() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr23, pageWrap.getModel().getAttr23());
+ }
+ if (pageWrap.getModel().getAttr24() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr24, pageWrap.getModel().getAttr24());
+ }
+ if (pageWrap.getModel().getAttr25() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr25, pageWrap.getModel().getAttr25());
+ }
+ if (pageWrap.getModel().getAttr26() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr26, pageWrap.getModel().getAttr26());
+ }
+ if (pageWrap.getModel().getAttr27() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr27, pageWrap.getModel().getAttr27());
+ }
+ if (pageWrap.getModel().getAttr28() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr28, pageWrap.getModel().getAttr28());
+ }
+ if (pageWrap.getModel().getAttr29() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr29, pageWrap.getModel().getAttr29());
+ }
+ if (pageWrap.getModel().getAttr30() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr30, pageWrap.getModel().getAttr30());
+ }
+ if (pageWrap.getModel().getAttr31() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr31, pageWrap.getModel().getAttr31());
+ }
+ if (pageWrap.getModel().getAttr32() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr32, pageWrap.getModel().getAttr32());
+ }
+ if (pageWrap.getModel().getAttr33() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr33, pageWrap.getModel().getAttr33());
+ }
+ if (pageWrap.getModel().getAttr34() != null) {
+ queryWrapper.lambda().eq(BaseData::getAttr34, pageWrap.getModel().getAttr34());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(BaseData::getStatus, pageWrap.getModel().getStatus());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(baseDataMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(BaseData baseData) {
+ QueryWrapper<BaseData> wrapper = new QueryWrapper<>(baseData);
+ return baseDataMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/service/src/main/resources/application-dev.yml b/server/service/src/main/resources/application-dev.yml
index 1571004..a173b0d 100644
--- a/server/service/src/main/resources/application-dev.yml
+++ b/server/service/src/main/resources/application-dev.yml
@@ -13,14 +13,14 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/pre_select_saas?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
- username: test
- password: doumee@168
- driver-class-name: com.mysql.cj.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
+
redis:
- # database: 0
+ # database: 0 url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/pre_select_saas?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ # username: test
+ # password: doumee@168
+ # driver-class-name: com.mysql.cj.jdbc.Driver
+ # type: com.alibaba.druid.pool.DruidDataSource
host: 127.0.0.1
port: 6379
password:
diff --git a/server/service/src/main/resources/application-test.yml b/server/service/src/main/resources/application-test.yml
index cf41b3f..b156ddf 100644
--- a/server/service/src/main/resources/application-test.yml
+++ b/server/service/src/main/resources/application-test.yml
@@ -11,7 +11,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/intelligent_manufacture?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/intelligent_manufacture_test?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
username: test
password: doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.9.3