111

src/main/java/com/izouma/zhirongip/dto/Criteria.java

@@ -0,0 +1,32 @@
+package com.izouma.zhirongip.dto;
+
+import lombok.Data;
+
+@Data
+public class Criteria {
+    private String key;
+    private Object value;
+    private String operator;
+
+    public Criteria() {}
+
+    public Criteria(String key, String operator, Object value) {
+        this.key = key;
+        this.operator = operator;
+        this.value = value;
+    }
+
+    public Criteria andGreaterThanOrEqualTo(String key, Object value) {
+        this.key = key;
+        this.operator = ">=";
+        this.value = value;
+        return this;
+    }
+
+    public Criteria andLessThanOrEqualTo(String key, Object value) {
+        this.key = key;
+        this.operator = "<=";
+        this.value = value;
+        return this;
+    }
+}

src/main/java/com/izouma/zhirongip/dto/PageQuery.java

@@ -2,7 +2,10 @@ package com.izouma.zhirongip.dto;
 
 import lombok.Data;
 
+
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -12,4 +15,14 @@ public class PageQuery {
     private String              sort;
     private String              search;
     private Map<String, Object> query = new HashMap<>();
+
+
+    private List<Criteria> criteriaList = new ArrayList<>();
+
+    public Criteria getCriteria() {
+        if (criteriaList.isEmpty()) {
+           criteriaList.add(new Criteria());
+        }
+        return criteriaList.get(0);
+    }
 }

src/main/java/com/izouma/zhirongip/web/resource/PolicyLawController.java

@@ -1,5 +1,6 @@
 package com.izouma.zhirongip.web.resource;
 
+import com.izouma.zhirongip.domain.resource.NumOfIp;
 import com.izouma.zhirongip.web.BaseController;
 import com.izouma.zhirongip.domain.resource.PolicyLaw;
 import com.izouma.zhirongip.service.resource.PolicyLawService;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+
+import java.time.LocalDate;
 import java.util.List;
 
 @RestController
@@ -39,7 +42,12 @@ public class PolicyLawController extends BaseController {
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<PolicyLaw> all(@RequestBody PageQuery pageQuery) {
+    public Page<PolicyLaw> all(@RequestParam(name = "year", required = false) Integer year, @RequestBody PageQuery pageQuery) {
+        LocalDate starDate = LocalDate.of(year, 1, 1);
+        LocalDate endDate = starDate.plusYears(1).minusDays(1);
+        pageQuery.getCriteria()
+                 .andGreaterThanOrEqualTo("issuedAt", starDate)
+                 .andLessThanOrEqualTo("issuedAt", endDate);
         return policyLawService.all(pageQuery);
     }
 
@@ -56,8 +64,12 @@ public class PolicyLawController extends BaseController {
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<PolicyLaw> data = all(pageQuery).getContent();
+        List<PolicyLaw> data = alll(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    public Page<PolicyLaw> alll( @RequestBody PageQuery pageQuery) {
+        return policyLawService.all(pageQuery);
+    }
 }
 

src/main/vue/src/plugins/http.js

@@ -6,9 +6,9 @@ let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
 
-        // baseUrl = 'http://localhost:8080';
+         baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://zhirongip.izouma.com';
-         baseUrl = 'http://yangzhouip.izouma.com';
+         //baseUrl = 'http://yangzhouip.izouma.com';
         // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':