归档第一版功能

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/InsectPestDetectionController.java

@@ -60,13 +60,13 @@ public class InsectPestDetectionController {
             @ApiImplicitParam(name = "iEndTdh", value = "结束通道号", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
     })
-    public ResponseEntity<PageInfo<Map<String, Object>>> getList(Integer pageNum, Integer pageSize, String vCfCode, Integer iBeginTdh, Integer iEndTdh,String orgId) {
+    public ResponseEntity<PageInfo<Map<String, Object>>> getList(Integer pageNum, Integer pageSize, String vCfCode, Integer iBeginTdh, Integer iEndTdh,String createTime,String orgId) {
         List<Map<String, Object>> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = insectPestDetectionService.getList(vCfCode, iBeginTdh, iEndTdh,orgId);
+            list = insectPestDetectionService.getList(vCfCode, iBeginTdh, iEndTdh,createTime,orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询失败");

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcdataMapper.xml

@@ -407,6 +407,9 @@
     <if test="vCfCode != null">
       and tv.v_cf_code = #{vCfCode}
     </if>
+    <if test="createTime != null">
+      AND td.v_update_time &lt; #{createTime}
+    </if>
     ORDER BY td.v_update_time DESC
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/InsectPestDetectionService.java

@@ -19,7 +19,7 @@ public interface InsectPestDetectionService {
      * @param iEndTdh
      * @return
      */
-    List<Map<String, Object>> getList(String vCfCode, Integer iBeginTdh, Integer iEndTdh,String orgId);
+    List<Map<String, Object>> getList(String vCfCode, Integer iBeginTdh, Integer iEndTdh,String createTime,String orgId);
 
     /**
      * 图表展示

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/InsectPestDetectionServiceImpl.java

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -43,7 +45,7 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
      * @return
      */
     @Override
-    public List<Map<String, Object>> getList(String vCfCode, Integer iBeginTdh, Integer iEndTdh,String orgId) {
+    public List<Map<String, Object>> getList(String vCfCode, Integer iBeginTdh, Integer iEndTdh,String createTime,String orgId) {
         Map<String, Object> map = new HashMap<>();
         map.put("orgId", orgId);
         if (StringUtils.isNotBlank(vCfCode)) {
@@ -61,6 +63,16 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
             map.put("iBeginTdh", iEndTdh);
             map.put("iEndTdh", iEndTdh);
         }
+        if (null == createTime && null != createTime) {//归档用
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date = dateFormat.parse(createTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            map.put("createTime", date);
+        }
         return tCcdataMapper.getList(map);
     }
 

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TWarningThresholdHistoryServiceImpl.java

@@ -12,6 +12,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +48,17 @@ public class TWarningThresholdHistoryServiceImpl implements TWarningThresholdHis
         if (StringUtils.isNotBlank(searchStartDate) && StringUtils.isNotBlank(searchEndDate)) {
             criteria.andWTimeBetween(DateUtils.stringToData(searchStartDate + DateUtils.startTime), DateUtils.stringToData(searchEndDate + DateUtils.endTime));
         }
+        if (StringUtils.isNotBlank(searchEndDate)) {
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date = dateFormat.parse(searchEndDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            criteria.andWTimeLessThan(date);
+        }
         criteria.andWWarningEqualTo(ConstUtils.ZERO);
         example.setOrderByClause("w_time DESC");
         List<TWarningThresholdHistory> tWarningThresholdHistories = tWarningThresholdHistoryMapper.selectByExample(example);

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TemperatureRecordServiceImpl.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -41,6 +43,16 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
             criteria.andTTimeBetween(DateUtils.stringToData(startTime + DateUtils.startTime), DateUtils.stringToData(endTime + DateUtils.endTime));
         }
+        if (StringUtils.isNotBlank(endTime)) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date = dateFormat.parse(endTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            criteria.andTTimeLessThan(date);
+        }
         if (StringUtils.isNotEmpty(tType)) {
             criteria.andIlqYqEqualTo(tType);
         }