定时任务 订单列表时间条件查询 配置yml mysql 连接 时间的多一天问题

@@ -3,9 +3,13 @@ package com.sunyo.energy.location;
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 @SpringBootApplication()
 @SpringBootApplication()
+@EnableScheduling
 @MapperScan("com.sunyo.energy.location.dao")
 @MapperScan("com.sunyo.energy.location.dao")
+@ComponentScan("com.sunyo.energy.location")
 public class BootApplication {
 public class BootApplication {
 
 
 	public static void main(String[] args) {
 	public static void main(String[] args) {

@@ -26,8 +26,9 @@ public class PayOrderController {
     @RequestMapping("/list")
     @RequestMapping("/list")
     public PageInfo<PayRecords> getOrder(@RequestParam(value = "pageSize", required = false, defaultValue = "1") int pageSize,
     public PageInfo<PayRecords> getOrder(@RequestParam(value = "pageSize", required = false, defaultValue = "1") int pageSize,
                                          @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
                                          @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
-                                         @RequestParam(value = "orderNumber",required = false) String orderNumber){
-        return payOrderService.getOrder(pageSize, pageNum, orderNumber);
+                                         @RequestParam(value = "orderNumber",required = false) String orderNumber,
+                                         @RequestParam(value = "payTime", required = false) String payTime ){
+        return payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime);
     }
     }
 
 
 
 

@@ -17,25 +17,25 @@ public class WaterMeterController {
     @Autowired
     @Autowired
     private WaterMeterService waterMeterService;
     private WaterMeterService waterMeterService;
 
 
-    /**
-     * 水表实施信息入库
-     * @param resultJson
-     * @return
-     */
-    @RequestMapping("/realTime")
-    @ResponseBody
-    public ResultJson realTime(ResultJson resultJson){
-        int i = waterMeterService.realTime();
-        if (i>0){
-            resultJson.setCode("200");
-            resultJson.setMsg("操作成功");
-        }else {
-            resultJson.setCode("500");
-            resultJson.setMsg("操作失败");
-        }
-
-        return resultJson;
-    }
+//    /**
+//     * 水表实施信息入库
+//     * @param resultJson
+//     * @return
+//     */
+//    @RequestMapping("/realTime")
+//    @ResponseBody
+//    public ResultJson realTime(ResultJson resultJson){
+//        int i = waterMeterService.realTime();
+//        if (i>0){
+//            resultJson.setCode("200");
+//            resultJson.setMsg("操作成功");
+//        }else {
+//            resultJson.setCode("500");
+//            resultJson.setMsg("操作失败");
+//        }
+//
+//        return resultJson;
+//    }
 
 
     /**
     /**
      * 水表单个实施信息查询
      * 水表单个实施信息查询

@@ -18,5 +18,7 @@ public interface PayRecordsMapper {
 
 
     int updateByPrimaryKey(PayRecords record);
     int updateByPrimaryKey(PayRecords record);
 
 
-    List<PayRecords> findAll(@Param(value = "orderNumber") String orderNumber);
+    List<PayRecords> findAll(@Param(value = "orderNumber") String orderNumber,
+                             @Param(value = "startTime") String startTime,
+                             @Param(value = "endTime") String endTime);
 }
 }

@@ -7,7 +7,7 @@ import com.sunyo.energy.location.model.PayRecords;
  * Created by XYH on 2019/12/16.
  * Created by XYH on 2019/12/16.
  */
  */
 public interface PayOrderService {
 public interface PayOrderService {
-    PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber);
+    PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime);
 
 
     int addOrder(PayRecords payRecords);
     int addOrder(PayRecords payRecords);
 
 

@@ -22,7 +22,12 @@ public class PayOrderImpl implements PayOrderService {
 
 
 
 
     @Override
     @Override
-    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber) {
+    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime) {
+
+        // 开始时间
+        String startTime = "";
+        // 结束时间
+        String endTime = "";
 
 
         Page<PayRecords> page =  PageHelper.startPage(pageNum,pageSize);
         Page<PayRecords> page =  PageHelper.startPage(pageNum,pageSize);
 
 
@@ -33,7 +38,13 @@ public class PayOrderImpl implements PayOrderService {
             orderNumber = stringBuffer.insert(3, "-").toString();
             orderNumber = stringBuffer.insert(3, "-").toString();
         }
         }
 
 
-        List<PayRecords> list = recordsMapper.findAll(orderNumber);
+        if (!StringUtils.isEmpty(payTime) && !payTime.contains("undefined")){
+            String[] split = payTime.split(",");
+            startTime = split[0].toString();
+            endTime = split[1].toString();
+        }
+
+        List<PayRecords> list = recordsMapper.findAll(orderNumber, startTime, endTime);
 
 
         PageInfo<PayRecords> result = new PageInfo<>(list);
         PageInfo<PayRecords> result = new PageInfo<>(list);
         return result;
         return result;

@@ -5,11 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.sunyo.energy.location.dao.WaterMeterMapper;
 import com.sunyo.energy.location.dao.WaterMeterMapper;
 import com.sunyo.energy.location.model.WaterMeter;
 import com.sunyo.energy.location.model.WaterMeter;
 import com.sunyo.energy.location.service.WaterMeterService;
 import com.sunyo.energy.location.service.WaterMeterService;
+import com.sunyo.energy.location.utils.HttpsUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import utils.HttpsUtils;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 
-import java.util.*;
 
 
 @Service
 @Service
 public class WaterMeterServiceImp implements WaterMeterService {
 public class WaterMeterServiceImp implements WaterMeterService {
@@ -19,6 +22,7 @@ public class WaterMeterServiceImp implements WaterMeterService {
 
 
 
 
     @Override
     @Override
+    @Scheduled(cron = "0 0 10 * * ?" )
     public int realTime() {
     public int realTime() {
 
 
         try {
         try {
@@ -26,9 +30,7 @@ public class WaterMeterServiceImp implements WaterMeterService {
             String url = "http://123.56.159.203:8023/nowwmrd/getSelectNowwmrdbyProjectID";
             String url = "http://123.56.159.203:8023/nowwmrd/getSelectNowwmrdbyProjectID";
             Map<String, Object> datas = new HashMap<>();
             Map<String, Object> datas = new HashMap<>();
             datas.put("ProjectID", "33-99-00-00-00-00-01");
             datas.put("ProjectID", "33-99-00-00-00-00-01");
-
             String s = HttpsUtils.httpRequest(url, datas);
             String s = HttpsUtils.httpRequest(url, datas);
-            List<WaterMeter> waterMeterList = new ArrayList<>();
             JSONArray jsonArray = JSON.parseArray(s);
             JSONArray jsonArray = JSON.parseArray(s);
             for (Object jsonObject:jsonArray){
             for (Object jsonObject:jsonArray){
                 WaterMeter waterMeter= new WaterMeter();
                 WaterMeter waterMeter= new WaterMeter();

-package utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.sunyo.energy.location.model.WaterMeter;
-import jdk.nashorn.internal.parser.JSONParser;
+package com.sunyo.energy.location.utils;
 
 
 import java.io.*;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 public class HttpsUtils {
 public class HttpsUtils {

@@ -67,7 +67,7 @@ spring:
 #        password: vmvnv1v2
 #        password: vmvnv1v2
         #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
         #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
         #url: jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true
         #url: jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true
-        url: jdbc:mysql://118.31.66.166:3306/EMPT?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true
+        url: jdbc:mysql://118.31.66.166:3306/EMPT?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
         username: 110
         username: 110
         password: QAHqCJf2kFYCLirM
         password: QAHqCJf2kFYCLirM
         driver-class-name: com.mysql.cj.jdbc.Driver
         driver-class-name: com.mysql.cj.jdbc.Driver

@@ -38,6 +38,12 @@
     <if test="orderNumber != '' and orderNumber != null">
     <if test="orderNumber != '' and orderNumber != null">
       and orderNumber = #{orderNumber,jdbcType=VARCHAR}
       and orderNumber = #{orderNumber,jdbcType=VARCHAR}
     </if>
     </if>
+    <if test="startTime != '' and startTime != null">
+      and payTime &gt; #{startTime,jdbcType=VARCHAR}
+    </if>
+    <if test="endTime != '' and endTime != null">
+      and payTime &lt; #{endTime,jdbcType=VARCHAR}
+    </if>
     order by payTime desc
     order by payTime desc
   </select>
   </select>