智能仓房添加查询条件

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

@@ -62,14 +62,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 orgId, String startTime, String endTime) {
         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,orgId,startTime,endTime);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询失败");

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

@@ -48,13 +48,13 @@ public class TWarningThresholdHistoryController {
             @ApiImplicitParam(name = "searchEndDate", value = "结束时间", paramType = "query"),
             @ApiImplicitParam(name = "showType", value = "模块名称", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TWarningThresholdHistory>> getList(Integer pageNum, Integer pageSize, String vCfCode, Integer state, String searchStartDate, String searchEndDate, String showType) {
+    public ResponseEntity<PageInfo<TWarningThresholdHistory>> getList(Integer pageNum, Integer pageSize, String vCfCode, Integer state, String searchStartDate, String searchEndDate, String showType, String wName) {
         List<TWarningThresholdHistory> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = tWarningThresholdHistoryService.getList(vCfCode, state, searchStartDate, searchEndDate, showType);
+            list = tWarningThresholdHistoryService.getList(vCfCode, state, searchStartDate, searchEndDate, showType, wName);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询失败");

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

@@ -401,12 +401,15 @@
     t_ccdata td
     LEFT JOIN t_ccvalue tv ON td.v_update_time = tv.v_update_time
     WHERE td.org_id = #{orgId} and td.v_cc_code = tv.v_cc_code
-    <if test="iBeginTdh != null and test=iEndTdh != null">
+    <if test="iBeginTdh != null and iEndTdh != null">
       and td.i_tdh BETWEEN #{iBeginTdh, jdbcType=INTEGER} AND #{iEndTdh, jdbcType=INTEGER}
     </if>
     <if test="vCfCode != null">
       and tv.v_cf_code = #{vCfCode}
     </if>
+    <if test="startTime != null and endTime != null">
+      and td.v_update_time BETWEEN #{startTime} AND #{endTime}
+    </if>
     ORDER BY
     td.v_update_time DESC
   </select>

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

@@ -20,7 +20,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 orgId, String startTime, String endTime);
 
     /**
      * 图表展示

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

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface TWarningThresholdHistoryService {
 
-    List<TWarningThresholdHistory> getList(String vCfCode, Integer state,String searchStartDate,String searchEndDate,String showType);
+    List<TWarningThresholdHistory> getList(String vCfCode, Integer state,String searchStartDate,String searchEndDate,String showType, String wName);
 
     Map<String, List<TWarningThresholdHistory>> getCfCdoeAndTimes(List cfcodes,List times);
 

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

@@ -44,7 +44,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 orgId, String startTime, String endTime) {
         Map<String, Object> map = new HashMap<>();
         map.put("orgId", orgId);
         if (StringUtils.isNotBlank(vCfCode)) {
@@ -62,6 +62,10 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
             map.put("iBeginTdh", iEndTdh);
             map.put("iEndTdh", iEndTdh);
         }
+        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+        }
         return tCcdataMapper.getList(map);
     }
 

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

@@ -22,7 +22,7 @@ public class TWarningThresholdHistoryServiceImpl implements TWarningThresholdHis
     private TWarningThresholdHistoryMapper tWarningThresholdHistoryMapper;
 
     @Override
-    public List<TWarningThresholdHistory> getList(String vCfCode, Integer state, String searchStartDate, String searchEndDate, String showType) {
+    public List<TWarningThresholdHistory> getList(String vCfCode, Integer state, String searchStartDate, String searchEndDate, String showType, String wName) {
         TWarningThresholdHistoryExample example = new TWarningThresholdHistoryExample();
         TWarningThresholdHistoryExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(vCfCode)){
@@ -41,6 +41,9 @@ 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(wName)) {
+            criteria.andWNameEqualTo(wName);
+        }
         criteria.andWWarningEqualTo("0");
         example.setOrderByClause("w_time DESC");
         List<TWarningThresholdHistory> tWarningThresholdHistories = tWarningThresholdHistoryMapper.selectByExample(example);