增加游标转枚举方法

src/main/java/com/ZhjreportApplication.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @EnableTransactionManagement
 @EnableConfigurationProperties

src/main/java/com/config/ConverterConfig.java

+package com.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+
+import javax.annotation.PostConstruct;
+
+
+/**
+ * @author ：dongjianhua
+ * @date ：Created in 2020/7/27 15:36
+ * @description：入参字符串转枚举
+ * @modified By：
+ * @version: 1.0
+ */
+@Configuration
+public class ConverterConfig {
+
+
+    @Autowired
+    private RequestMappingHandlerAdapter requestMappingHandlerAdapter;
+
+    /**
+     *
+     */
+    @PostConstruct
+    public void addConverterConfig() {
+        ConfigurableWebBindingInitializer initializer = (ConfigurableWebBindingInitializer) requestMappingHandlerAdapter.getWebBindingInitializer();
+        if (initializer.getConversionService() != null) {
+            GenericConversionService genericConversionService = (GenericConversionService) initializer.getConversionService();
+            //添加游标转枚举
+            genericConversionService.addConverterFactory(new MyConverterFactory());
+
+        }
+    }
+
+
+    public class MyConverterFactory implements ConverterFactory<String, Enum> {
+        @Override
+        public <T extends Enum> Converter<String, T> getConverter(Class<T> aClass) {
+            return new EnumConverter(aClass);
+        }
+    }
+
+    public static class EnumConverter<T extends Enum> implements Converter<String, T> {
+        private Class<T> enumType;
+
+        public EnumConverter(Class<T> enumType) {
+            this.enumType = enumType;
+        }
+
+        @Override
+        public T convert(String source) {
+            if (source.length() == 0) {
+                return null;
+            }
+            return enumType.getEnumConstants()[Integer.parseInt(source)];
+        }
+    }
+
+}

src/main/java/com/controller/QueryStatisticsController.java

 package com.controller;
 
+import com.emums.Corporation;
+import com.emums.DataSource;
 import com.model.JsonResult;
 import com.model.QueryStatisticsModel;
 import com.service.statistics.QueryStatisticsService;
-import com.util.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,12 +12,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
-import javax.xml.crypto.Data;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author ：dongjianhua
@@ -34,11 +33,18 @@ public class QueryStatisticsController {
 
     @RequestMapping("/query")
     @Validated
-    public JsonResult query(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull Date start, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull Date end){
-
-
-        List<QueryStatisticsModel> query = queryStatisticsService.query(new Timestamp(start.getTime()),new Timestamp(end.getTime()));
-
+    public JsonResult query(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull Date start,
+                            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull Date end,
+                            DataSource source, Corporation corporation) {
+
+
+        List<QueryStatisticsModel> query = queryStatisticsService.query(new Timestamp(start.getTime()), new Timestamp(end.getTime()));
+        if (null != source) {
+            query = query.stream().filter(o -> o.getDataSource() == source).collect(Collectors.toList());
+        }
+        if (null != corporation) {
+            query = query.stream().filter(o -> o.getCorporation() == corporation).collect(Collectors.toList());
+        }
         return JsonResult.success(query);
     }
 }

src/main/java/com/model/JsonResult.java

@@ -35,7 +35,7 @@ public class JsonResult<T> {
     }
 
     public static <T> JsonResult<T> success(T data) {
-        return buildResult(ErrorType.SUCCESS, null, null, data);
+        return buildResult(ErrorType.SUCCESS, null, "正确", data);
     }
 
     public static <T> JsonResult<T> error(ErrorType errorType, String extendCode, String msg) {

src/main/java/com/service/statistics/impl/ZhjReportAndSearchNum.java

@@ -50,15 +50,20 @@ public class ZhjReportAndSearchNum implements GetReportAndSearchNum {
         entry.setQueryQuantity(gdXdSearchNum);
         entry.setMaxQueryNum(0L);
         entry.setCorporation(Corporation.GUANGDAXIAODAI);
-        Map<String, String> resultMap = reportService.querycontral();
 
-        if(resultMap.get("code").equals("200")){
-            String data = resultMap.get("data");
-            JSONObject parse = JSON.parseObject(data);
-            String maxquerycount = parse.getString("maxquerycount");
-            entry.setMaxQueryNum(Long.valueOf(maxquerycount));
-        }
+        /**
+         * 如果是当月才回去查
+         */
+        if(DateUtil.formatterDate(date, DateUtil.YYYY_MM).equals(DateUtil.formatterDate(new Date(), DateUtil.YYYY_MM))){
+            Map<String, String> resultMap = reportService.querycontral();
 
+            if(resultMap.get("code").equals("200")){
+                String data = resultMap.get("data");
+                JSONObject parse = JSON.parseObject(data);
+                String maxquerycount = parse.getString("maxquerycount");
+                entry.setMaxQueryNum(Long.valueOf(maxquerycount));
+            }
+        }
         return Lists.newArrayList(entry);
     }
 

src/main/java/com/timer/QueryStatisticsTimer.java

@@ -28,4 +28,5 @@ private QueryStatisticsService queryStatisticsService;
 
         queryStatisticsService.doStatisticsSave(calendar.getTime());
     }
+
 }

src/main/resources/mybatis/report/ZhjMapper.xml

@@ -4,10 +4,13 @@
     <!--广达中互金查询量-->
     <select id="getGdXdSearchNum" resultType="long">
 
-        SELECT count(*) FROM common_request_event c WHERE
-        c.request_url_type
-        in ('ZhongHuJinThreeElement','ZhongHuJinWholeIn','ZhongHuJinCreditReport','ZhongHuJinJudicial','ZhongHuJinCreditReportPl')
-        and time_created >= #{start} and time_created &lt; #{end}
+        SELECT count(*) FROM
+        common_request_event c
+        WHERE c.request_url_type
+        in ('ZhongHuJinCreditReport','ZhongHuJinCreditReportPl')
+        and time_created >= #{start}
+        and time_created &lt; #{end}
+        and  is_billing ='0'
     </select>
 
     <!--广达实体报送量-->