diff --git a/build.gradle b/build.gradle index 85d1a7e..47cb8fd 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ configure(allprojects) { project -> } jar { -// apply plugin:'war' + apply plugin:'war' from sourceSets.main.allJava manifest { attributes 'weaver-ecode-seconddev-id': rootProject.group + '-' + rootProject.name, diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java index e66f814..faf92c0 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; public class OrderTypeBrowser extends AbstractWeaBrowserBaseService { @Autowired - private PageDemoService demoService; + private PageDemoService pageDemoService; /** * @param params @@ -64,7 +64,7 @@ public class OrderTypeBrowser extends AbstractWeaBrowserBaseService { queryParam.setName(Objects.isNull(name) ? "" : name.toString()); queryParam.setCurrent(Long.parseLong(params.getOrDefault("current", "1").toString())); queryParam.setPageSize(Long.parseLong(params.getOrDefault("pageSize", "10").toString())); - Pagepage = demoService.orderTypePage(queryParam); + Pagepage = pageDemoService.orderTypePage(queryParam); resultMap.put(WeaBrowserConstant.BROWSER_RESULT_DATA, convert2BrowserData(page.getRecords())); resultMap.put(WeaBrowserConstant.BROWSER_RESULT_TOTAL, page.getTotal()); @@ -81,7 +81,7 @@ public class OrderTypeBrowser extends AbstractWeaBrowserBaseService { queryParam.setName(Objects.isNull(name) ? "" : name.toString()); queryParam.setCurrent(Long.parseLong(params.getOrDefault("current", "1").toString())); queryParam.setPageSize(Long.parseLong(params.getOrDefault("pageSize", "10").toString())); - Page page = demoService.orderTypePage(queryParam); + Page page = pageDemoService.orderTypePage(queryParam); Map resultMap = Maps.newHashMap(); resultMap.put(WeaBrowserConstant.BROWSER_RESULT_TOTAL, page.getTotal()); diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java index a485397..cd92f08 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java @@ -13,6 +13,6 @@ public class Constant { /** * 模块标识 */ - public static final String MODULE = "pageDemo"; + public static final String MODULE = "qt"; } diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/controller/DemoController.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/controller/DemoController.java index f2436ca..2553283 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/controller/DemoController.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/controller/DemoController.java @@ -1,20 +1,27 @@ package com.weaver.seconddev.qt.controller; import com.weaver.common.authority.annotation.WeaPermission; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.seconddev.qt.entity.po.DemoPO; import com.weaver.seconddev.qt.service.MybatisDemoService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/api/secondev/qt/demo") @WeaPermission(publicPermission = true) public class DemoController { @Autowired - private MybatisDemoService pageDemoService; - - + private MybatisDemoService mybatisDemoService; + @GetMapping("/list") + public WeaResult> getSearchCondition() { + return WeaResult.success(mybatisDemoService.list()); + } } \ No newline at end of file diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java index 6b8f7e1..695b5ce 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java @@ -1,5 +1,7 @@ package com.weaver.seconddev.qt.entity.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.weaver.common.component.table.type.WeaTableTypeEnum; import com.weaver.seconddev.qt.annotation.Table; import com.weaver.seconddev.qt.annotation.TableColumn; @@ -23,6 +25,7 @@ import lombok.NoArgsConstructor; }) public class DemoListDTO { + @JsonSerialize(using = ToStringSerializer.class) private Long id; @TableColumn(label = "标题", labelId = 0, width = "150") diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/OrderTypeListDTO.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/OrderTypeListDTO.java index cdfdf5e..4b30a58 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/OrderTypeListDTO.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/OrderTypeListDTO.java @@ -1,5 +1,7 @@ package com.weaver.seconddev.qt.entity.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,6 +14,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class OrderTypeListDTO { + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String mc; diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/MybatisDemoService.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/MybatisDemoService.java index 8b206b2..83d86e3 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/MybatisDemoService.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/MybatisDemoService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.weaver.seconddev.qt.entity.po.DemoPO; /** - * 数据库最佳实践demo + * db最佳实践demo *

Copyright: Copyright (c) 2024

*

Company: 泛微软件

* @@ -14,4 +14,5 @@ import com.weaver.seconddev.qt.entity.po.DemoPO; public interface MybatisDemoService extends IService { + } diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/MybatisDemoServiceImpl.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/MybatisDemoServiceImpl.java index 2808ea0..b1f36e5 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/MybatisDemoServiceImpl.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/MybatisDemoServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * mybatis demo + * db最佳实践 *

Copyright: Copyright (c) 2024

*

Company: 泛微软件

* diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java index ea9e41d..d6faf84 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java @@ -72,7 +72,7 @@ public class PageDemoServiceImpl implements PageDemoService { @Override public Page orderTypePage(OrderTypeQueryParam queryParam) { - String sql = "select t.id,t.mc,from uf_gdlx t where e.TENANT_KEY = 'tma3ktp1q7' "; + String sql = "select t.id,t.mc from uf_gdlx t where t.TENANT_KEY = 'tma3ktp1q7' "; ExecuteSqlEntity executeSqlEntity = new ExecuteSqlEntity(); executeSqlEntity.setSql(Base64.encode(sql)); executeSqlEntity.setGroupId("weaver-ebuilder-app-service"); @@ -80,6 +80,9 @@ public class PageDemoServiceImpl implements PageDemoService { Map map = dataSetService.executeSql(executeSqlEntity); SqlResponse sqlResponse = EntityUtil.map2Entity(map, OrderTypeListDTO.class); + if (SQLStatusEnum.FAIL.getValue().equals(sqlResponse.getStatus())) { + throw new SqlRunTimeException(sqlResponse.getMessage()); + } List list = sqlResponse.getRecords(); Page page = PageUtil.buildPage(list, queryParam.getCurrent(), queryParam.getPageSize()); @@ -101,6 +104,9 @@ public class PageDemoServiceImpl implements PageDemoService { Map map = dataSetService.executeSql(executeSqlEntity); SqlResponse sqlResponse = EntityUtil.map2Entity(map, DemoListDTO.class); + if (SQLStatusEnum.FAIL.getValue().equals(sqlResponse.getStatus())) { + throw new SqlRunTimeException(sqlResponse.getMessage()); + } List list = sqlResponse.getRecords(); dataFormDTO = list.get(0); }