From ab0d73badddd715901ae85d8d8923b1a459d8a30 Mon Sep 17 00:00:00 2001 From: jiyufei <67400194@qq.com> Date: Thu, 15 Aug 2024 16:17:29 +0800 Subject: [PATCH] =?UTF-8?q?feat():sqlserver=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 6 + .../YysSupplierInformationService.java | 1 + .../YysSupplierInformationServiceImpl.java | 12 ++ .../YysSupplierInformationController.java | 157 ++++++++++-------- 4 files changed, 107 insertions(+), 69 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml index d6bb85e..6de3698 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml @@ -59,6 +59,7 @@ spring: statementPrepareAfterLogEnabled: false statementPrepareCallAfterLogEnabled: false statementParameterSetLogEnabled: false + validation-query: SELECT 1 datasource: master: url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC @@ -70,6 +71,11 @@ spring: username: ${spring.datasource.username} password: ${spring.datasource.password} driver-class-name: com.mysql.cj.jdbc.Driver + slave_2: + url: jdbc:sqlserver://localhost:1433;DatabaseName=UFDATA_888_2018;trustServerCertificate=true + username: sa + password: '123456' + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # ===================== Redis配置 ===================== # redis单机模式 diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysSupplierInformationService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysSupplierInformationService.java index f63f36d..e562ead 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysSupplierInformationService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysSupplierInformationService.java @@ -32,4 +32,5 @@ public interface YysSupplierInformationService extends IService> test(); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierInformationServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierInformationServiceImpl.java index 4a127e7..f32e33e 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierInformationServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierInformationServiceImpl.java @@ -1,5 +1,6 @@ package jnpf.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import jnpf.entity.*; import jnpf.mapper.YysSupplierInformationMapper; import jnpf.service.*; @@ -18,6 +19,7 @@ import java.util.regex.Pattern; import jnpf.model.QueryModel; import java.util.stream.Collectors; import jnpf.base.model.ColumnDataModel; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.database.model.superQuery.SuperJsonModel; @@ -46,6 +48,9 @@ public class YysSupplierInformationServiceImpl extends ServiceImpl getList(YysSupplierInformationPagination yysSupplierInformationPagination){ return getTypeList(yysSupplierInformationPagination,yysSupplierInformationPagination.getDataType()); @@ -284,4 +289,11 @@ public class YysSupplierInformationServiceImpl extends ServiceImpl> test() { + String sql = "select * from dbo.Vendor"; + return jdbcTemplate.queryForList(sql); + } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysSupplierInformationController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysSupplierInformationController.java index d643db7..7967cd1 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysSupplierInformationController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysSupplierInformationController.java @@ -15,22 +15,27 @@ import jnpf.model.yyssupplierinformation.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.validation.Valid; import java.util.*; + import jnpf.annotation.JnpfField; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.base.entity.ProvinceEntity; + import java.io.IOException; import java.util.stream.Collectors; + import jnpf.engine.entity.FlowTaskEntity; import jnpf.exception.WorkFlowException; import org.springframework.transaction.annotation.Transactional; /** * yysSupplierInformation + * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 @@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Slf4j @RestController -@Tag(name = "yysSupplierInformation" , description = "example") +@Tag(name = "yysSupplierInformation", description = "example") @RequestMapping("/api/example/YysSupplierInformation") public class YysSupplierInformationController { @@ -52,27 +57,26 @@ public class YysSupplierInformationController { private YysSupplierInformationService yysSupplierInformationService; - /** - * 列表 - * - * @param yysSupplierInformationPagination - * @return - */ + * 列表 + * + * @param yysSupplierInformationPagination + * @return + */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody YysSupplierInformationPagination yysSupplierInformationPagination)throws IOException{ - List list= yysSupplierInformationService.getList(yysSupplierInformationPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysSupplierInformationPagination yysSupplierInformationPagination) throws IOException { + List list = yysSupplierInformationService.getList(yysSupplierInformationPagination); + List> realList = new ArrayList<>(); for (YysSupplierInformationEntity entity : list) { - Map yysSupplierInformationMap=JsonUtil.entityToMap(entity); - yysSupplierInformationMap.put("id", yysSupplierInformationMap.get("id")); - //副表数据 - //子表数据 + Map yysSupplierInformationMap = JsonUtil.entityToMap(entity); + yysSupplierInformationMap.put("id", yysSupplierInformationMap.get("id")); + //副表数据 + //子表数据 realList.add(yysSupplierInformationMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysSupplierInformationConstant.getFormData(), YysSupplierInformationConstant.getColumnData(), yysSupplierInformationPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysSupplierInformationConstant.getFormData(), YysSupplierInformationConstant.getColumnData(), yysSupplierInformationPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -81,110 +85,125 @@ public class YysSupplierInformationController { vo.setPagination(page); return ActionResult.success(vo); } + /** - * 创建 - * - * @param yysSupplierInformationForm - * @return - */ + * 创建 + * + * @param yysSupplierInformationForm + * @return + */ @PostMapping() @Operation(summary = "创建") public ActionResult create(@RequestBody @Valid YysSupplierInformationForm yysSupplierInformationForm) { - String b = yysSupplierInformationService.checkForm(yysSupplierInformationForm,0); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysSupplierInformationService.checkForm(yysSupplierInformationForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysSupplierInformationService.saveOrUpdate(yysSupplierInformationForm, null ,true); - }catch(Exception e){ + try { + yysSupplierInformationService.saveOrUpdate(yysSupplierInformationForm, null, true); + } catch (Exception e) { return ActionResult.fail("新增数据失败"); } return ActionResult.success("创建成功"); } + /** - * 编辑 - * @param id - * @param yysSupplierInformationForm - * @return - */ + * 编辑 + * + * @param id + * @param yysSupplierInformationForm + * @return + */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysSupplierInformationForm yysSupplierInformationForm, - @RequestParam(value = "isImport", required = false) boolean isImport){ + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysSupplierInformationForm yysSupplierInformationForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { yysSupplierInformationForm.setId(id); if (!isImport) { - String b = yysSupplierInformationService.checkForm(yysSupplierInformationForm,1); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysSupplierInformationService.checkForm(yysSupplierInformationForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } } - YysSupplierInformationEntity entity= yysSupplierInformationService.getInfo(id); - if(entity!=null){ - try{ - yysSupplierInformationService.saveOrUpdate(yysSupplierInformationForm,id,false); - }catch(Exception e){ + YysSupplierInformationEntity entity = yysSupplierInformationService.getInfo(id); + if (entity != null) { + try { + yysSupplierInformationService.saveOrUpdate(yysSupplierInformationForm, id, false); + } catch (Exception e) { return ActionResult.fail("修改数据失败"); } return ActionResult.success("更新成功"); - }else{ + } else { return ActionResult.fail("更新失败，数据不存在"); } } + /** - * 删除 - * @param id - * @return - */ + * 删除 + * + * @param id + * @return + */ @Operation(summary = "删除") @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - YysSupplierInformationEntity entity= yysSupplierInformationService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysSupplierInformationEntity entity = yysSupplierInformationService.getInfo(id); + if (entity != null) { //主表数据删除 yysSupplierInformationService.delete(entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysSupplierInformationEntity entity= yysSupplierInformationService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysSupplierInformationEntity entity = yysSupplierInformationService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysSupplierInformationMap=JsonUtil.entityToMap(entity); + Map yysSupplierInformationMap = JsonUtil.entityToMap(entity); yysSupplierInformationMap.put("id", yysSupplierInformationMap.get("id")); //副表数据 //子表数据 - yysSupplierInformationMap = generaterSwapUtil.swapDataDetail(yysSupplierInformationMap,YysSupplierInformationConstant.getFormData(),"591239930433244933",false); + yysSupplierInformationMap = generaterSwapUtil.swapDataDetail(yysSupplierInformationMap, YysSupplierInformationConstant.getFormData(), "591239930433244933", false); return ActionResult.success(yysSupplierInformationMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysSupplierInformationEntity entity= yysSupplierInformationService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysSupplierInformationEntity entity = yysSupplierInformationService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysSupplierInformationMap=JsonUtil.entityToMap(entity); + Map yysSupplierInformationMap = JsonUtil.entityToMap(entity); yysSupplierInformationMap.put("id", yysSupplierInformationMap.get("id")); //副表数据 //子表数据 - yysSupplierInformationMap = generaterSwapUtil.swapDataForm(yysSupplierInformationMap,YysSupplierInformationConstant.getFormData(),YysSupplierInformationConstant.TABLEFIELDKEY,YysSupplierInformationConstant.TABLERENAMES); + yysSupplierInformationMap = generaterSwapUtil.swapDataForm(yysSupplierInformationMap, YysSupplierInformationConstant.getFormData(), YysSupplierInformationConstant.TABLEFIELDKEY, YysSupplierInformationConstant.TABLERENAMES); return ActionResult.success(yysSupplierInformationMap); } + @Operation(summary = "测试连接sqlserver数据库返回数据") + @GetMapping("/test") + public ActionResult test() { + return ActionResult.success(yysSupplierInformationService.test()); + } + }