添加查询条件-代码优化-01

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/TemperatureRecordController.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.grainsituation.controller;
 
+import com.chinaitop.depot.intelligent.common.ConstantCommon;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
 import com.chinaitop.depot.intelligent.grainsituation.service.TPointsService;
@@ -17,9 +18,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,19 +49,21 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query"),
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TTestdata>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String startTime, String endTime, String tType,String orgId) {
-        List<TTestdata> list = null;
+    public ResponseEntity getList(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
         try {
+            if (StringUtils.isBlank(tType))
+                return ResponseEntity.failed(ConstantCommon.CHECK_TYPE);
+            if (StringUtils.isBlank(orgId))
+                return ResponseEntity.failed(ConstantCommon.ORGID_NOT_NULL);
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = temperatureRecordService.getList(vCfCode, vDatatime, startTime, endTime, tType, orgId);
+            PageInfo<TTestdata> list = temperatureRecordService.getList(vCfCode, vDatatime, startTime, endTime, tType, orgId);
+            return ResponseEntity.ok(list);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());
         }
-        PageInfo<TTestdata> pageInfo = new PageInfo<TTestdata>(list);
-        return ResponseEntity.ok(pageInfo);
     }
 
     /**
@@ -91,11 +92,10 @@ public class TemperatureRecordController {
     }
 
     /**
-     *
      * @param lqId
      * @param vCfCode
      * @param vDatatime
-     * @param viewFlag true: 表格数据,false: 3D三温图数据
+     * @param viewFlag  true: 表格数据,false: 3D三温图数据
      * @return
      */
     @RequestMapping(value = "/findByHouseAndTimes", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)

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

@@ -453,10 +453,8 @@
     select
     <include refid="Base_Column_List" />
     from t_testdata
-    WHERE 1=1
-    <if test="orgId != null and orgId != ''" >
-      AND org_id = #{orgId}
-    </if>
+    WHERE org_id = #{orgId}
+    AND iLq_yq = #{tType}
     <if test="vCfCode != null and vCfCode != ''" >
       AND storehouse = #{vCfCode}
     </if>
@@ -466,9 +464,6 @@
     <if test="startTime != null and endTime != null" >
       AND time between #{startTime} AND #{endTime}
     </if>
-    <if test="tType != null and tType != ''" >
-      AND iLq_yq = #{tType}
-    </if>
     ORDER BY
     DATE_FORMAT(time, '%Y-%m-%d') DESC,
     storehouse

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/TemperatureRecordService.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.intelligent.grainsituation.service;
 
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
+import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
@@ -9,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 public interface TemperatureRecordService {
-    List<TTestdata> getList(String vCfCode, String vDatatime, String startTime, String endTime,String tType,String orgId);
+    PageInfo<TTestdata> getList(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId);
 
     List<TTestdataLayer> findByHouseAndTime(String lqId,String vCfCode, String vDatatime);
 

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

@@ -1,12 +1,12 @@
 package com.chinaitop.depot.intelligent.grainsituation.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TTestdataLayerMapper;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TTestdataMapper;
 import com.chinaitop.depot.intelligent.grainsituation.model.*;
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.chinaitop.depot.intelligent.utils.DateUtils;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
@@ -22,12 +22,11 @@ import java.util.stream.Collectors;
 public class TemperatureRecordServiceImpl implements TemperatureRecordService {
     @Resource
     private TTestdataMapper tTestdataMapper;
-
     @Resource
     private TTestdataLayerMapper tTestdataLayerMapper;
 
     @Override
-    public List<TTestdata> getList(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
+    public PageInfo<TTestdata> getList(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
         HashMap<String, String> map = Maps.newHashMap();
         map.put("vCfCode", vCfCode);
         map.put("tType", tType);
@@ -40,10 +39,11 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
             map.put("time1", vDatatime + DateUtils.startTime);
             map.put("time2", vDatatime + DateUtils.endTime);
         }
-        return tTestdataMapper.selectByMultipleConditions(map);
+        List<TTestdata> tTestdata = tTestdataMapper.selectByMultipleConditions(map);
+        PageInfo<TTestdata> pageInfo = new PageInfo<TTestdata>(tTestdata);
+        return pageInfo;
     }
 
-
     @Override
     public List<TTestdataLayer> findByHouseAndTime(String lqId, String vCfCode, String vDatatime) {
         TTestdataLayerExample tTestdataLayerExample = new TTestdataLayerExample();