删除beanConfig

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/controller/finalCheckController.java → dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/controller/FinalCheckController.java

 package com.tykj.dev.device.finalcheck.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.device.finalcheck.entity.vo.finalReportVo;
-import com.tykj.dev.device.finalcheck.repisotry.finalDetailRepo;
-import com.tykj.dev.device.finalcheck.repisotry.finalReportRepo;
+import com.tykj.dev.device.finalcheck.entity.other.TimeParam;
+import com.tykj.dev.device.finalcheck.entity.vo.FinalReportVo;
+import com.tykj.dev.device.finalcheck.repisotry.FinalDetailRepo;
+import com.tykj.dev.device.finalcheck.repisotry.FinalReportRepo;
 import com.tykj.dev.misc.base.ResultObj;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -18,36 +20,50 @@ import org.springframework.web.bind.annotation.*;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/9/24 at 6:24 下午
  */
+@Slf4j
 @AutoDocument
 @RestController
 @RequestMapping("/check/final")
 @Api(tags = "决算模块", description = "决算模块")
-public class finalCheckController {
+public class FinalCheckController {
 
 
     @Autowired
-    private finalDetailRepo detailRepo;
+    private FinalDetailRepo detailRepo;
 
     @Autowired
-    private finalReportRepo reportRepo;
+    private FinalReportRepo reportRepo;
+
+    @PostMapping("/test")
+    public ResponseEntity test(@RequestBody TimeParam param) {
+        log.info("测试打印参数 {}", param);
+        return ResponseEntity.ok("ok");
+    }
+
 
     @GetMapping("/reports")
     @ApiOperation(value = "查询所有决算报告(不附带详情数据)")
-    public ResponseEntity<ResultObj<finalReportVo>> findAllReports() {
+    public ResponseEntity<ResultObj<FinalReportVo>> findAllReports(String keyword) {
+
+        return ResultUtil.success(new FinalReportVo());
+    }
 
-        return ResultUtil.success(new finalReportVo());
+    @PostMapping("/reports")
+    public ResponseEntity generateReport(
+    ) {
+        return null;
     }
 
     @GetMapping("/{id}")
     @ApiOperation(value = "根据id查询决算报告(附带详情数据)")
-    public ResponseEntity<ResultObj<finalReportVo>> findReportById(@PathVariable Integer id) {
-        return ResultUtil.success(new finalReportVo());
+    public ResponseEntity<ResultObj<FinalReportVo>> findReportById(@PathVariable Integer id) {
+        return ResultUtil.success(new FinalReportVo());
     }
 
     @PostMapping("/excel/{id}")
     @ApiOperation(value = "根据id导出对应的excel数据")
-    public ResponseEntity<ResultObj<finalReportVo>> exportExcel(@PathVariable Integer id) {
+    public ResponseEntity<ResultObj<FinalReportVo>> exportExcel(@PathVariable Integer id) {
 
-        return ResultUtil.success(new finalReportVo());
+        return ResultUtil.success(new FinalReportVo());
     }
 }

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/domain/finalDetail.java

 package com.tykj.dev.device.finalcheck.entity.domain;
 
+import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,11 +21,7 @@ import javax.persistence.Id;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class finalDetail {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
+public class finalDetail extends BaseEntity {
 
     private String model;
 

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/domain/finalReport.java

 package com.tykj.dev.device.finalcheck.entity.domain;
 
-import com.tykj.dev.device.finalcheck.entity.vo.finalDetailVo;
-import com.tykj.dev.device.finalcheck.entity.vo.finalReportVo;
+import com.tykj.dev.device.finalcheck.entity.vo.FinalDetailVo;
+import com.tykj.dev.device.finalcheck.entity.vo.FinalReportVo;
+import com.tykj.dev.misc.base.BaseEntity;
 import com.tykj.dev.misc.utils.MapperUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -24,11 +25,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class finalReport {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
+public class finalReport extends BaseEntity {
 
     private String unitName;
 
@@ -40,9 +37,9 @@ public class finalReport {
 
     private String operator;
 
-    public finalReportVo toVo(List<finalDetail> details) {
-        finalReportVo reportVo = MapperUtils.map(this, finalReportVo.class);
-        List<finalDetailVo> detailVos = MapperUtils.mapAll(details, finalDetailVo.class);
+    public FinalReportVo toVo(List<finalDetail> details) {
+        FinalReportVo reportVo = MapperUtils.map(this, FinalReportVo.class);
+        List<FinalDetailVo> detailVos = MapperUtils.mapAll(details, FinalDetailVo.class);
         reportVo.setDetails(detailVos);
         return reportVo;
     }

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/other/TimeParam.java

+package com.tykj.dev.device.finalcheck.entity.other;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * TimeParam.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2020/9/28 at 11:24 上午
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TimeParam {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+}

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/finalDetailVo.java → dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/FinalDetailVo.java

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel(value = "决算报告细节")
-public class finalDetailVo {
+public class FinalDetailVo {
 
     @ApiModelProperty("主键")
     private Integer id;

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/finalReportVo.java → dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/FinalReportVo.java

@@ -23,7 +23,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("决算报告概览")
-public class finalReportVo {
+public class FinalReportVo {
 
     @ApiModelProperty("主键")
     private Integer id;
@@ -50,6 +50,6 @@ public class finalReportVo {
     private String operator;
 
     @ApiModelProperty("报告细节列表")
-    private List<finalDetailVo> details;
+    private List<FinalDetailVo> details;
 
 }

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/repisotry/finalDetailRepo.java → dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/repisotry/FinalDetailRepo.java

@@ -11,5 +11,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/9/24 at 6:26 下午
  */
-public interface finalDetailRepo extends JpaRepository<finalDetail,Integer>, JpaSpecificationExecutor<finalDetail> {
+public interface FinalDetailRepo extends JpaRepository<finalDetail,Integer>, JpaSpecificationExecutor<finalDetail> {
 }

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/repisotry/finalReportRepo.java → dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/repisotry/FinalReportRepo.java

@@ -10,5 +10,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/9/24 at 6:27 下午
  */
-public interface finalReportRepo extends JpaRepository<finalReport, Integer>, JpaSpecificationExecutor<finalReport> {
+public interface FinalReportRepo extends JpaRepository<finalReport, Integer>, JpaSpecificationExecutor<finalReport> {
 }

dev-union/src/main/java/com/tykj/dev/union/BeanConfig.java

-package com.tykj.dev.union;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class BeanConfig {
-}

dev-union/src/test/java/com/tykj/dev/repair/RepairControllerTest.java

@@ -2,29 +2,19 @@ package com.tykj.dev.repair;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wenhao.jpa.Specifications;
-import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.repair.repository.RepairDetailDao;
-import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import com.tykj.dev.device.repair.subject.vo.*;
 import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.subject.domin.Task;
-import com.tykj.dev.device.user.subject.entity.SecurityUser;
-import com.tykj.dev.device.user.subject.entity.User;
-import com.tykj.dev.device.user.util.AuthenticationUtils;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.ResultObj;
 import com.tykj.dev.misc.base.StatusEnum;
-import com.tykj.dev.misc.utils.SpringUtils;
 import com.tykj.dev.union.BaseTest;
-import com.tykj.dev.union.BeanConfig;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.RequestBuilder;