Merge branch 'master' into feature_longhu

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

@@ -3,8 +3,7 @@ package com.hr.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 
-import com.hr.dto.MyDto;
-import com.hr.dto.MyParmDto;
+import com.hr.dto.*;
 
 import com.hr.fegin.dto.MyDemoDto;
 import com.hr.repository.jpa.TestJpa;
@@ -13,16 +12,31 @@ import com.hr.repository.service.DemoService;
 import com.hr.repository.service.TransServer;
 import com.github.pagehelper.PageHelper;
 
+import com.hr.system.api.domain.SysDictData;
 import com.yy.basedevelop.common.data.BasePageResult;
 import com.yy.basedevelop.common.data.BaseReturnDto;
 
 
+import com.yy.basedevelop.common.http.config.RedisService;
+import com.yy.basedevelop.common.http.config.ThreadLocalContext;
+import com.yy.basedevelop.common.util.DictUtil;
+import com.yy.basedevelop.common.util.ExcelUtil;
+import com.yy.basedevelop.common.util.HttpClientUtils;
+import com.yy.basedevelop.common.util.OSSUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.random.RandomGenerator;
 
@@ -41,12 +55,147 @@ public class DemoController {
     private TransServer transServer;
     @Autowired
     private DemoService demoService;
+    @Autowired
+    private RedisService redisService;
+    @Autowired
+    private OSSUtil oSSUtil;
+
+
+
+    @PostMapping("listdict")
+    public TestDemoDto listdict(@RequestBody TestDemoDto dto) {
+        log.info("listdict=:{}", dto);
+
+        TestDemoDto dto1 = new TestDemoDto();
+        //将中文的 字典类型，字典标签转换为字典的value
+        //比如 用户性别,男 转换为 1
+        dto1.setDictValue(DictUtil.getDictCodeStr(dto.getDictTypeNameCn(),dto.getDictNameCn()));
+        Integer val=DictUtil.getDictCodeInt(dto.getDictTypeNameCn(),dto.getDictNameCn());
+        log.info("val=:{}", val);
+        return dto1;
+    }
+
+    @PostMapping("listoss")
+    public TestDemoDto listoss(@RequestPart("file") FilePart filePart,
+                               @RequestPart("description") String description,
+                               @RequestPart("path") String path) {
+        log.info("接收的listoss=:{},path={}", description,path);
+
+
+        String ossstr=oSSUtil.upLoadInputStream(filePart, "esgin" + path);
+
+
+        TestDemoDto dto1 = new TestDemoDto();
+        dto1.setName("返回名字oss");
+        dto1.setAge(25);
+        dto1.setOssUrl(ossstr);
+        return dto1;
+    }
+
+    @PostMapping("listname7")
+    public Mono<TestDemoDto> list566d(@RequestBody TestDemoDto dto) {
+        log.info("接收的DTO777=:{}", dto);
+
+
+        TestDemoDto dto1 = new TestDemoDto();
+        dto1.setName("返回的名字1");
+        dto1.setAge(18);
+        return Mono.just(dto1);
+    }
+
+    @PostMapping("listname8")
+    public TestDemoDto list5668(@RequestBody TestDemoDto dto) {
+        log.info("接收的DTO8=:{}", dto);
 
+        Boolean baaa=redisService.hasKey("aaa");
+        log.info("在redis中aaa的key是否存在={}", baaa);
 
+        TestDemoDto dto1 = new TestDemoDto();
+        dto1.setName("直接返回Dto");
+        dto1.setAge(26);
+        return dto1;
+    }
+
+    @GetMapping("listname6")
+    public Mono<TestDemoDto> listname6(ServerHttpResponse response) {
+        JSONObject json = new JSONObject();
+        json.put("name", "传输名字");
+        json.put("age", "20");
+
+
+
+        Mono<TestDemoDto> js=HttpClientUtils.post("http://localhost:9700/test/listname7",json,TestDemoDto.class);
+        js.subscribe(js1->{
+           log.info("当前返回的Dto:{}",js1);
+        });
+        TestDemoDto d=js.block();
+        log.info("在Mono外部打印日志,返回值:{}",d);
+
+        String returnstr=HttpClientUtils.post("http://localhost:9700/test/listname8",json);
+        log.info("直接返回String:{}",returnstr);
+
+
+        return js;
+
+    }
+
+    @GetMapping("listname5")
+    public Mono<Void> export(ServerHttpResponse response) {
+
+        ExcelUtil<DemoExcelDto> util = new ExcelUtil<DemoExcelDto>(DemoExcelDto.class);
+        List<DemoExcelDto> list = new ArrayList<>();
+        DemoExcelDto d1 = new DemoExcelDto();
+        d1.setName("名字1");
+        d1.setTestCode("test1");
+        d1.setMydate(new Date());
+        list.add(d1);
+        DemoExcelDto d2 = new DemoExcelDto();
+        d2.setName("名字2");
+        d2.setTestCode("test2");
+        d2.setMydate(new Date());
+        list.add(d2);
+        DemoExcelDto d3 = new DemoExcelDto();
+        d3.setName("名字3");
+        d3.setTestCode("test3");
+        d3.setMydate(new Date());
+        list.add(d3);
+
+        DemoExcelDto d4 = new DemoExcelDto();
+        d4.setName("名字4");
+        d4.setTestCode("test4");//没有值则导出来是空白
+        d4.setMydate(new Date());
+        list.add(d4);
+
+        return util.exportExcel(response, list, "字典数据");
+    }
+
+    @PostMapping("listname3")
+    public BaseReturnDto list222(@RequestBody SysDictData sysDictData) {
+
+        List<SysDictData> list=DictUtil.getSysDictDataByKey(sysDictData.getDictType());
+        return BaseReturnDto.success(list);
+    }
+
+    /***
+     * 分页查询例子
+     * @param dto
+     * @return
+     */
+    @PostMapping("listname")
+    public BasePageResult<MyDemoDto> queryname(@RequestBody QueryDto dto) {
+        BasePageResult<MyDemoDto> lst=demoService.qyeryList(dto);
+
+        return  lst.success();
+    }
 
-    @GetMapping("listname")
-    public BasePageResult<MyDemoDto> queryname(@RequestParam("name") String name) {
-        BasePageResult<MyDemoDto> lst=demoService.qyeryList(name);
+    /***
+     * 分页查询例子,直接传Dto查询
+     * @param dto
+     * @return
+     */
+    @PostMapping("listpage2")
+    public BasePageResult<MyDemoDto> listpage2(@RequestBody QueryDto dto) {
+        BasePageResult<MyDemoDto> lst=demoService.qyeryList3(dto);
 
         return  lst.success();
     }

src/main/java/com/hr/dto/DemoExcelDto.java

@@ -0,0 +1,37 @@
+package com.hr.dto;
+
+import com.yy.basedevelop.common.util.ruoyi.annotation.Excel;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.util.Date;
+
+/**
+ * @author yaoy
+ * @createTime 2025/10/13 14:11
+ **/
+@Data
+public class DemoExcelDto {
+
+    @Excel(
+            name = "名字",
+            cellType = Excel.ColumnType.STRING,
+            headerColor= IndexedColors.BLUE1
+    )
+    private String name;
+
+    @Excel(
+            name = "名字",
+            cellType = Excel.ColumnType.STRING,
+            headerColor= IndexedColors.CORAL,
+            dictName="test_code"
+    )
+    private String testCode;
+    @Excel(
+            name = "日期",
+            cellType = Excel.ColumnType.STRING,
+            headerColor= IndexedColors.LAVENDER,
+            dateFormat = "yyyy-MM-dd HH:mm:ss"
+    )
+    private Date mydate;
+}

src/main/java/com/hr/dto/QueryDto.java

@@ -0,0 +1,15 @@
+package com.hr.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yaoy
+ * @createTime 2025/10/15 15:31
+ **/
+@Data
+public class QueryDto {
+    private String name;
+    private List<Integer> ids;
+}

src/main/java/com/hr/dto/TestDemoDto.java

@@ -0,0 +1,24 @@
+package com.hr.dto;
+
+import com.yy.basedevelop.common.data.BaseReturnDto;
+import lombok.Data;
+
+/**
+ * @author yaoy
+ * @createTime 2025/10/14 09:39
+ **/
+@Data
+public class TestDemoDto extends BaseReturnDto {
+
+    private String name;
+
+    private String ossUrl;
+
+    private String dictNameCn;
+
+    private String dictTypeNameCn;
+
+    private String dictValue;
+
+    private int age;
+}

src/main/java/com/hr/repository/domain/Demo1Entity.java

@@ -19,6 +19,9 @@ public class Demo1Entity extends BaseHrEntity {
     @Column(name = "fname", columnDefinition = "varchar(80)  NULL comment 'fname'")
     private String fname;
 
+    @Column
+    private String addrRemark;
+
     @Version
     protected Long version = 0L;
 }

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

@@ -1,5 +1,6 @@
 package com.hr.repository.jpa;
 
+import com.hr.dto.QueryDto;
 import com.hr.fegin.dto.MyDemoDto;
 import com.hr.repository.domain.Demo1Entity;
 import com.hr.repository.domain.TestEntity;
@@ -18,8 +19,11 @@ public interface Demo1Jpa extends JpaRepository<Demo1Entity, String> {
 
     public List<TestEntity> findByFname(String name);
 
-    @Query(nativeQuery=true,value="select t.* from demo1 t where t.fname like '%'||:name||'%'")
-    public BasePageResult<MyDemoDto> queryList(@Param("name") String name);
+//    @Query(nativeQuery=true,value="select t.* from demo1 t where t.fname like '%'||:#{#d.name}||'%' and fid in (:#{#d.ids})")
+    public BasePageResult<MyDemoDto> queryList3(QueryDto dto);
+
+    @Query(nativeQuery=true,value="select t.* from demo1 t where t.fname like '%'||:name||'%' and fid in (:ids)")
+    public BasePageResult<MyDemoDto> queryList(@Param("name")   String name, @Param("ids") List<Integer> ids);
 
     public BasePageResult<MyDemoDto> select1(@Param("name") String fname,@Param("id") String id);
 }

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

@@ -1,6 +1,7 @@
 package com.hr.repository.service;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.hr.dto.QueryDto;
 import com.hr.fegin.dto.MyDemoDto;
 import com.hr.repository.domain.TestEntity;
 import com.hr.repository.jpa.Demo1Jpa;
@@ -35,8 +36,13 @@ public class DemoService {
 //        }
     }
 
-    public BasePageResult<MyDemoDto> qyeryList(String name){
-        BasePageResult<MyDemoDto> list= demo1Jpa.queryList(name);
+    public BasePageResult<MyDemoDto> qyeryList(QueryDto dto){
+        BasePageResult<MyDemoDto> list= demo1Jpa.queryList(dto.getName(),dto.getIds());
+        return list;
+    }
+
+    public BasePageResult<MyDemoDto> qyeryList3(QueryDto dto){
+        BasePageResult<MyDemoDto> list= demo1Jpa.queryList3(dto);
         return list;
     }
 

src/main/resources/mapper/Demo1Mapper.xml

@@ -9,7 +9,9 @@
 		<result property="fname"       column="fname"      />
 
 	</resultMap>
-
+	<select id="queryList3">
+		select t.* from demo1 t where 1=1 and t.fname like '%'||#{name}||'%' and fid in (#{ids})
+	</select>
 	<select id="select1">
 		select t.* from demo1 t where t.fname like '%'||:name||'%' and t.fid=:id
 	</select>

src/main/resources/mapper/TestMapper.xml

@@ -10,6 +10,8 @@
 
 	</resultMap>
 
+
+
 	<select id="queryMylist">
 		select id,name
 		from test