1、添加MyObjectUtils工具类，添加方法查找对象中属性值为null的属性名列表

2、修改WorkDto的静态方法toWork，添加参数work，让workDto的属性整合到指定的work中 3、修改WorkServiceImpl，完善listWorks方法，修正updateWork方法，使用WorkDto的新的toWork方法整合Work对戏 4、删除WorkPageRequest 5、修改WorkQueryRequest属性，将workPageRequest的属性移入，删除不必要的属性，添加is_template属性时手动生成get/set方法，使用Lombok生成有问题 6、修改WorkUpdateRequest属性，删除createTime的初始化定义 7、修改WorkController，添加initBinder，适应前端以下划线命名的参数，传到后台不能转换成对象的问题 8、添加UploadController，值添加方法前端映射，方法实现后续再议 9、修改pom.xml，修改spring-boot-maven-plugin定义，添加<fork>false</fork>，解决不能debug的问题

1、添加MyObjectUtils工具类，添加方法查找对象中属性值为null的属性名列表
2、修改WorkDto的静态方法toWork，添加参数work，让workDto的属性整合到指定的work中 3、修改WorkServiceImpl，完善listWorks方法，修正updateWork方法，使用WorkDto的新的toWork方法整合Work对戏 4、删除WorkPageRequest 5、修改WorkQueryRequest属性，将workPageRequest的属性移入，删除不必要的属性，添加is_template属性时手动生成get/set方法，使用Lombok生成有问题 6、修改WorkUpdateRequest属性，删除createTime的初始化定义 7、修改WorkController，添加initBinder，适应前端以下划线命名的参数，传到后台不能转换成对象的问题 8、添加UploadController，值添加方法前端映射，方法实现后续再议 9、修改pom.xml，修改spring-boot-maven-plugin定义，添加<fork>false</fork>，解决不能debug的问题
徐烜
1 parent 27b23e0d
Showing 13 changed files with 173 additions and 120 deletions
pom.xml
src/main/java/com/bsth/luban_springboot2/controller/UploadController.java
src/main/java/com/bsth/luban_springboot2/controller/WorkController.java
src/main/java/com/bsth/luban_springboot2/dto/WorkDto.java
src/main/java/com/bsth/luban_springboot2/dto/request/WorkPageRequest.java
src/main/java/com/bsth/luban_springboot2/dto/request/WorkQueryRequest.java
src/main/java/com/bsth/luban_springboot2/dto/request/WorkUpdateRequest.java
src/main/java/com/bsth/luban_springboot2/entity/Work.java
src/main/java/com/bsth/luban_springboot2/service/WorkService.java
src/main/java/com/bsth/luban_springboot2/service/impl/WorkServiceImpl.java
src/main/java/com/bsth/luban_springboot2/utils/MyObjectUtils.java
src/main/resources/logback-spring.xml
src/test/java/com/bsth/luban_springboot2/LubanSpringboot2ServiceTests.java
@@ -87,6 +87,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>false</fork>
+                </configuration>
 			</plugin>
 		</plugins>
 	</build>
+package com.bsth.luban_springboot2.controller;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 上传文件控制器
+ * TODO：swagger标注后面再加
+ */
+@RestController
+@RequestMapping(value = "/upload")
+public class UploadController {
+
+    @PostMapping
+    public void upload(
+            @RequestParam(name = "files") MultipartFile file,
+            @RequestParam(name = "workId") Long workId) {
+        // TODO：后面再做上传
+
+
+        System.out.println(workId);
+    }
+}
@@ -2,19 +2,19 @@ package com.bsth.luban_springboot2.controller;
 import com.bsth.luban_springboot2.dto.WorkDto;
 import com.bsth.luban_springboot2.dto.request.WorkCreateRequest;
-import com.bsth.luban_springboot2.dto.request.WorkPageRequest;
 import com.bsth.luban_springboot2.dto.request.WorkQueryRequest;
 import com.bsth.luban_springboot2.dto.request.WorkUpdateRequest;
 import com.bsth.luban_springboot2.service.WorkService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.util.List;
 /**
  * 作品控制器（和鲁班h5后台strapi.js保持一致）。
@@ -32,17 +32,33 @@ public class WorkController {
         return this.workService.findWorkById(id);
     }
+    @InitBinder
+    protected void initBinder(WebDataBinder binder) {
+        // springMVC请求参数绑定对象属性时，忽略前缀是下划线的名字，如_ocx这种参数
+        // 1、不使用下划线
+        // 2、使用initBinder定义没有前缀
+        binder.setFieldMarkerPrefix(null);
+    }
+
+    // 作品数量
+    @RequestMapping(value = "/count", method = RequestMethod.GET)
+    public Long countWork(@Valid @ModelAttribute WorkQueryRequest request) {
+        WorkDto workDto = WorkDto.getBuilder()
+                .setTemplate(request.isIs_template())
+                .build();
+        return this.workService.countWork(workDto);
+    }
+
     // 分页查询work
     @RequestMapping(method = RequestMethod.GET)
-    public Page<WorkDto> listWorks(
-            @Valid @ModelAttribute WorkQueryRequest request,
-            @Valid @ModelAttribute WorkPageRequest workPageRequest) {
+    public List<WorkDto> listWorks(@Valid @ModelAttribute WorkQueryRequest request) {
         PageRequest pageRequest = PageRequest.of(
-                workPageRequest.getPage(), workPageRequest.getSize(),
+                request.get_start(), request.get_limit(),
                 Sort.Direction.DESC, "createTime");
-        WorkDto workDto = new WorkDto();
-        BeanUtils.copyProperties(request, workDto);
+        WorkDto workDto = WorkDto.getBuilder()
+                .setTemplate(request.isIs_template())
+                .build();
         return this.workService.listWorks(workDto, pageRequest);
     }
@@ -77,14 +93,6 @@ public class WorkController {
         return this.workService.markWorkAsTemplate(id);
     }
-    // 作品数量
-    @RequestMapping(value = "/count", method = RequestMethod.GET)
-    public Long countWork(@Valid @ModelAttribute WorkQueryRequest request) {
-        WorkDto workDto = new WorkDto();
-        BeanUtils.copyProperties(request, workDto);
-        return this.workService.countWork(workDto);
-    }
-
     // 使用模版创建作品
     @RequestMapping(value = "/use-template/{id}", method = RequestMethod.POST)
     public WorkDto useTemplate(@PathVariable Long id) {
 package com.bsth.luban_springboot2.dto;
 import com.bsth.luban_springboot2.entity.Work;
+import com.bsth.luban_springboot2.utils.MyObjectUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 /**
  * 作品Dto。
@@ -168,12 +165,27 @@ public class WorkDto implements Serializable {
     /**
      * 转换成Work对象。
-     * @param workDto
+     * @param work 原始work对象
+     * @param workDto 等待复制用的workDto
+     * @param ignoreNullProperties 是否忽略空值
      * @return
      */
-    public static Work toWork(WorkDto workDto) {
-        Work work = new Work();
-        BeanUtils.copyProperties(workDto, work);
+    public static Work toWork(Work work, WorkDto workDto, boolean ignoreNullProperties) {
+        if (work == null) {
+            throw new RuntimeException("原始work对象为空！");
+        }
+
+        if (ignoreNullProperties) {
+            List<String> emptyPropertyNames = MyObjectUtils.getNullValueProperties(workDto);
+            if (CollectionUtils.isEmpty(emptyPropertyNames)) {
+                BeanUtils.copyProperties(workDto, work);
+            } else {
+                String[] result = new String[emptyPropertyNames.size()];
+                BeanUtils.copyProperties(workDto, work, (String[]) emptyPropertyNames.toArray(result));
+            }
+        } else {
+            BeanUtils.copyProperties(workDto, work);
+        }
         if (!CollectionUtils.isEmpty(workDto.getPages())) {
             ObjectMapper objectMapper = new ObjectMapper();
             try {
@@ -184,8 +196,10 @@ public class WorkDto implements Serializable {
             }
         }
+
         return work;
     }
+
     public static Builder getBuilder() {
         return new Builder();
     }
@@ -278,42 +292,22 @@ public class WorkDto implements Serializable {
         /**
          * 使用work对象直接复制属性。
          * @param work
+         * @param ignoreNullProperties 是否忽略空值
          * @return
          */
-        public Builder setPropertyFromWork(Work work) {
-            setPropertyFromWork(work, false);
-            return this;
-        }
-        /**
-         * 使用work对象直接复制属性（忽略空值属性）。
-         * @param work
-         * @return
-         */
-        public Builder setPropertyFromWorkIgnoreNullProperties(Work work) {
-            setPropertyFromWork(work, true);
-            return this;
-        }
-
-        private void setPropertyFromWork(Work work, boolean ignoreNullProperties) {
+        public Builder setPropertyFromWork(Work work, boolean ignoreNullProperties) {
             if (ignoreNullProperties) {
-                // 查找空值属性名数组
-                final BeanWrapper src = new BeanWrapperImpl(work);
-                java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors();
-                Set emptyNames = new HashSet();
-                for(java.beans.PropertyDescriptor pd : pds) {
-                    //check if value of this property is null then add it to the collection
-                    Object srcValue = src.getPropertyValue(pd.getName());
-                    if (srcValue == null) {
-                        emptyNames.add(pd.getName());
-                    }
+                List<String> emptyPropertyNames = MyObjectUtils.getNullValueProperties(work);
+                if (CollectionUtils.isEmpty(emptyPropertyNames)) {
+                    BeanUtils.copyProperties(work, this);
+                } else {
+                    String[] result = new String[emptyPropertyNames.size()];
+                    BeanUtils.copyProperties(work, this, (String[]) emptyPropertyNames.toArray(result));
                 }
-                String[] result = new String[emptyNames.size()];
-                BeanUtils.copyProperties(work, this, (String[]) emptyNames.toArray(result));
-
             } else {
                 BeanUtils.copyProperties(work, this);
             }
-            if (!StringUtils.hasText(work.getPages())) {
+            if (StringUtils.hasText(work.getPages())) {
                 ObjectMapper objectMapper = new ObjectMapper();
                 TypeReference<List<Object>> type = new TypeReference<List<Object>>() {};
                 try {
@@ -325,6 +319,7 @@ public class WorkDto implements Serializable {
                 }
             }
+            return this;
         }
         public WorkDto build() {
-package com.bsth.luban_springboot2.dto.request;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 分页请求。
- */
-@Data
-public class WorkPageRequest {
-    /** 第几页（从0开始） */
-    @JsonProperty(value = "_start")
-    private Integer page;
-    /** 每页记录数 */
-    @JsonProperty(value = "_limit")
-    private Integer size;
-}
 package com.bsth.luban_springboot2.dto.request;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 /**
@@ -8,13 +7,17 @@ import lombok.Data;
  */
 @Data
 public class WorkQueryRequest {
-    private String title;
+    private boolean is_template;
+    /** 每页记录数 */
+    private Integer _limit;
+    /** 第几页（从0开始） */
+    private Integer _start;
-    private String description;
+    public boolean isIs_template() {
+        return is_template;
+    }
-    @JsonProperty(value = "is_publish")
-    private boolean publish = false;
-
-    @JsonProperty(value = "is_template")
-    private boolean template = false;
+    public void setIs_template(boolean is_template) {
+        this.is_template = is_template;
+    }
 }
@@ -23,7 +23,7 @@ public class WorkUpdateRequest {
     private List<Object> pages;
     @JsonProperty(value = "create_at")
-    private Date createTime = new Date();
+    private Date createTime;
     @JsonProperty(value = "update_at")
     private Date updateTime = new Date();
@@ -93,4 +93,5 @@ public class Work implements Serializable {
     @org.hibernate.annotations.ForeignKey(name = "none")
     private Set<WorkForm> workForms = new HashSet<>();
+
 }
 package com.bsth.luban_springboot2.service;
 import com.bsth.luban_springboot2.dto.WorkDto;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import java.util.List;
+
 /**
  * 作品Service。
  */
@@ -15,7 +16,7 @@ public interface WorkService {
      * @param pageable
      * @return
      */
-    Page<WorkDto> listWorks(WorkDto workDto, Pageable pageable);
+    List<WorkDto> listWorks(WorkDto workDto, Pageable pageable);
     /**
      * 创建work。
@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 /**
@@ -25,18 +26,33 @@ public class WorkServiceImpl implements WorkService {
     private WorkRepo workRepo;
     @Override
-    public Page<WorkDto> listWorks(WorkDto workDto, Pageable pageable) {
-        // TODO：暂无业务驱动
+    public Long countWork(WorkDto workDto) {
+        Work work = WorkDto.toWork(new Work(), workDto, false);
+        Example<Work> example = Example.of(work);
+        return this.workRepo.count(example);
+    }
+
+    @Override
+    public List<WorkDto> listWorks(WorkDto workDto, Pageable pageable) {
+        Work work = WorkDto.toWork(new Work(), workDto, false);
+        Example<Work> example = Example.of(work);
+        Page<Work> workPage = this.workRepo.findAll(example, pageable);
+        Page<WorkDto> workDtoPage = workPage.map((work_source) -> {
+            WorkDto workDto_convert = WorkDto.getBuilder()
+                    .setPropertyFromWork(work_source, false)
+                    .build();
+            return workDto_convert;
+        });
-        return null;
+        return workDtoPage.getContent();
     }
     @Override
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public WorkDto createWork(WorkDto workDto) {
-        Work work = WorkDto.toWork(workDto);
+        Work work = WorkDto.toWork(new Work(), workDto, true);
         work = this.workRepo.save(work);
-        return WorkDto.getBuilder().setPropertyFromWork(work).build();
+        return WorkDto.getBuilder().setPropertyFromWork(work, false).build();
     }
     @Override
@@ -47,15 +63,10 @@ public class WorkServiceImpl implements WorkService {
         if (work == null) {
             return null;
         }
-
-        WorkDto updateWorkDto = WorkDto
-                .getBuilder()
-                .setPropertyFromWorkIgnoreNullProperties(work)
-                .setUpdateTime(new Date())
-                .build();
-        Work updateWork = WorkDto.toWork(updateWorkDto);
+        Work updateWork = WorkDto.toWork(work, workDto, true);
+        updateWork.setUpdateTime(new Date());
         updateWork = this.workRepo.save(updateWork);
-        return WorkDto.getBuilder().setPropertyFromWork(updateWork).build();
+        return WorkDto.getBuilder().setPropertyFromWork(updateWork, false).build();
     }
     @Override
@@ -65,7 +76,7 @@ public class WorkServiceImpl implements WorkService {
         if (work == null) {
             return null;
         } else {
-            return WorkDto.getBuilder().setPropertyFromWork(work).build();
+            return WorkDto.getBuilder().setPropertyFromWork(work, false).build();
         }
     }
@@ -79,7 +90,7 @@ public class WorkServiceImpl implements WorkService {
         } else {
             WorkDto workDto = WorkDto
                     .getBuilder()
-                    .setPropertyFromWorkIgnoreNullProperties(work)
+                    .setPropertyFromWork(work, false)
                     .build();
             this.workRepo.deleteById(id);
             return workDto;
@@ -98,14 +109,7 @@ public class WorkServiceImpl implements WorkService {
         work.setTemplate(true);
         work.setUpdateTime(new Date());
         work = this.workRepo.save(work);
-        return WorkDto.getBuilder().setPropertyFromWork(work).build();
-    }
-
-    @Override
-    public Long countWork(WorkDto workDto) {
-        Work work = WorkDto.toWork(workDto);
-        Example<Work> example = Example.of(work);
-        return this.workRepo.count(example);
+        return WorkDto.getBuilder().setPropertyFromWork(work, false).build();
     }
     @Override
@@ -118,13 +122,15 @@ public class WorkServiceImpl implements WorkService {
         }
         WorkDto templateWorkDto = WorkDto
                 .getBuilder()
-                .setPropertyFromWork(work)
+                .setPropertyFromWork(work, false)
                 .setId(null)
                 .setTemplate(false)
                 .setPublish(false)
+                .setCreateTime(new Date())
+                .setUpdateTime(new Date())
                 .build();
-        Work newWork = WorkDto.toWork(templateWorkDto);
+        Work newWork = WorkDto.toWork(new Work(), templateWorkDto, false);
         newWork = this.workRepo.save(newWork);
-        return WorkDto.getBuilder().setPropertyFromWork(newWork).build();
+        return WorkDto.getBuilder().setPropertyFromWork(newWork, false).build();
     }
 }
+package com.bsth.luban_springboot2.utils;
+
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 对象工具类。
+ */
+public class MyObjectUtils {
+    /**
+     * 获取对象中属性值为null的属性名列表。
+     * @param obj
+     * @return
+     */
+    public static List<String> getNullValueProperties(Object obj) {
+        List<String> emptyPropertyNames = new ArrayList<>();
+        final BeanWrapper src = new BeanWrapperImpl(obj);
+        PropertyDescriptor[] pds = src.getPropertyDescriptors();
+        for (PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue == null) {
+                emptyPropertyNames.add(pd.getName());
+            }
+        }
+        return emptyPropertyNames;
+    }
+}
@@ -23,11 +23,6 @@
         <appender-ref ref="STDOUT" />
     </logger>
-    <logger name="com.xuxuan.hotel_service"
-            level="DEBUG" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
 package com.bsth.luban_springboot2;
-import com.bsth.luban_springboot2.dto.request.WorkPageRequest;
+import com.bsth.luban_springboot2.dto.request.WorkQueryRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -34,13 +34,14 @@ class LubanSpringboot2ServiceTests extends BaseTest_junit5 {
     @Test
 	void contextLoads() throws Exception {
         // 测试@JsonProperty
-        WorkPageRequest workPageRequest = new WorkPageRequest();
-        workPageRequest.setPage(0);
-        workPageRequest.setSize(10);
-        LOG.info("json={}", new ObjectMapper().writeValueAsString(workPageRequest));
-
-        String json = "{\"_start\":0,\"_limit\":10}";
-        LOG.info("object={}", new ObjectMapper().readValue(json, WorkPageRequest.class).toString());
+        WorkQueryRequest workQueryRequest = new WorkQueryRequest();
+        workQueryRequest.setIs_template(true);
+        workQueryRequest.set_start(0);
+        workQueryRequest.set_limit(10);
+        LOG.info("json={}", new ObjectMapper().writeValueAsString(workQueryRequest));
+
+        String json = "{\"is_template\": true,\"_start\":0,\"_limit\":10}";
+        LOG.info("object={}", new ObjectMapper().readValue(json, WorkQueryRequest.class).toString());
 	}