Merge branch 'master' into feature_longhu

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

src/main/java/com/hr/controller/DemoController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ServerWebExchange;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.random.RandomGenerator;
 
 
@@ -42,12 +43,21 @@ public class DemoController {
     private DemoService demoService;
 
 
+
     @GetMapping("listname")
     public BasePageResult<MyDemoDto> queryname(@RequestParam("name") String name) {
         BasePageResult<MyDemoDto> lst=demoService.qyeryList(name);
+
         return  lst.success();
     }
 
+
+    @GetMapping("listname2")
+    public BasePageResult<MyDemoDto> select1(@RequestParam("name") String name) {
+        PageHelper.startPage(2, 10);
+        return demoService.selectList1(name);
+    }
+
     @GetMapping("calldemo2")
     public MyDto demo2() {
 

src/main/java/com/hr/repository/jpa/Demo1Jpa.java

@@ -20,4 +20,6 @@ public interface Demo1Jpa extends JpaRepository<Demo1Entity, String> {
 
     @Query(nativeQuery=true,value="select t.* from demo1 t where t.fname like '%'||:name||'%'")
     public BasePageResult<MyDemoDto> queryList(@Param("name") String name);
+
+    public BasePageResult<MyDemoDto> select1(@Param("name") String fname,@Param("id") String id);
 }

src/main/java/com/hr/repository/service/DemoService.java

@@ -39,4 +39,11 @@ public class DemoService {
         BasePageResult<MyDemoDto> list= demo1Jpa.queryList(name);
         return list;
     }
+
+    public BasePageResult<MyDemoDto> selectList1(String name){
+       return demo1Jpa.select1(name,null);
+
+    }
+
+
 }

src/main/resources/bootstrap-dev.yml

@@ -1,58 +0,0 @@
-## Spring
-#
-#
-#
-##spring:
-##  cloud:
-##    nacos:
-##      discovery:
-##        # 服务注册地址
-##        server-addr: 127.0.0.1:8848
-##        namespace: public
-##      config:
-##        namespace: public
-##        group: DEFAULT_GROUP
-##        # 配置中心地址
-##        server-addr: 127.0.0.1:8848
-##        prefix: ${spring.application.name}
-##        # 配置文件格式
-##        file-extension: yml
-##  config:
-##    import-check:
-##      enabled: false
-##    import:
-##      - nacos:${spring.application.name}-${spring.profiles.active}.yml
-##配置动态更新网关路由信息
-##dynamic:
-##  route:
-##    address: ${spring.cloud.nacos.discovery.server-addr}
-##    namespace: public
-##    dataId: dynamic-${spring.application.name}-${spring.profiles.active}
-##    group: DEFAULT_GROUP
-##    timeout: 50000
-#seata:
-#  client:
-#    async-committing-retry-period: 1000
-#    lock:
-#      retry-interval: 10
-#    rpc:
-#      timeout: 20000 # 单位毫秒
-#  enabled: true
-#  webflux:
-#    enable: true
-#  data-source-proxy-mode: AT
-#  registry:
-#    nacos:
-#      server-addr: 192.168.0.243:8848
-#      namespace: seata-server
-#      group: SEATA_GROUP
-#      application: seata-server
-#    type: nacos
-#  service:
-#    vgroup-mapping:
-#      default_tx_group: default
-#    grouplist:
-#      default: 192.168.0.243:8091 # 这里应为 Seata Server 的实际地址
-#  tx-service-group: default_tx_group
-#  enable-auto-data-source-proxy: false # 取消自动代理
-#

src/main/resources/mapper/Demo1Mapper.xml

@@ -0,0 +1,20 @@
+<?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.hr.repository.jpa.Demo1Jpa">
+
+	<resultMap type="com.hr.repository.domain.Demo1Entity" id="Demo1Result">
+		<id     property="fid"         column="fid"        />
+		<result property="fname"       column="fname"      />
+
+	</resultMap>
+
+	<select id="select1">
+		select t.* from demo1 t where t.fname like '%'||:name||'%' and t.fid=:id
+	</select>
+
+
+
+
+</mapper>