时实数据查询优化

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

@@ -47,16 +47,16 @@ public class RealTimeDataController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query", defaultValue = "10"),
             @ApiImplicitParam(name = "storehouse", value = "仓房编码", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TTestdata>> getByCfCodes(Integer pageNum, Integer pageSize, String storehouse) {
+    public ResponseEntity<PageInfo<TTestdata>> getByCfCodes(Integer pageNum, Integer pageSize, String storehouse, String orgId) {
         List<TTestdata> list = null;
         if (StringUtils.isNotBlank(storehouse)) {
             PageHelper.startPage(1, 1);
-            list = grainCheckAnalyzeService.getByCfCode(storehouse);
+            list = grainCheckAnalyzeService.getByCfCode(storehouse, orgId);
         } else {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, (pageSize == 1 ? 10 : pageSize));
             }
-            list = grainCheckAnalyzeService.getNewest(storehouse);
+            list = grainCheckAnalyzeService.getNewest(storehouse, orgId);
         }
         PageInfo<TTestdata> pageInfo = new PageInfo<>(list);
         return ResponseEntity.ok(pageInfo);

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

@@ -80,7 +80,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, org_id, storehouse, house, time, inTemp, inH, outTemp, outH, max, min, avg, data_source, 
+    id, org_id, storehouse, house, time, inTemp, inH, outTemp, outH, max, min, avg, data_source,
     updatetime, iLq_yq
   </sql>
   <sql id="Blob_Column_List" >
@@ -399,18 +399,35 @@
   </select>
   <select id="getNewest" resultMap="BaseResultMap" parameterType="java.util.Map">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM
-    (
-    SELECT
-    <include refid="Base_Column_List"/>
+        t2.id,
+        t2.org_id,
+        t2.storehouse,
+        t2.house,
+        t2.time,
+        t2.inTemp,
+        t2.inH,
+        t2.outTemp,
+        t2.outH,
+        t2.max,
+        t2.min,
+        t2.avg,
+        t2.data_source,
+        t2.updatetime,
+        t2.iLq_yq
     FROM
-    t_testdata
-    ORDER BY
-    time DESC limit 10000000000
-    ) a
-    GROUP BY
-    a.storehouse
+        (
+            SELECT
+                MAX(time) time,
+                org_id
+            FROM
+                t_testdata
+            WHERE
+                org_id = 163
+            GROUP BY
+                storehouse
+        ) t1
+    LEFT JOIN t_testdata t2 ON t1.time = t2.time
+    AND t1.org_id = t2.org_id
   </select>
 
     <select id="getById" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String">

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

@@ -29,7 +29,7 @@ public interface GrainCheckAnalyzeService {
      * @param storehouse
      * @return
      */
-    List<TTestdata> getNewest(String storehouse);
+    List<TTestdata> getNewest(String storehouse, String orgId);
 
-    List<TTestdata> getByCfCode(String storehouse);
+    List<TTestdata> getByCfCode(String storehouse, String orgId);
 }

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

@@ -121,17 +121,22 @@ public class GrainCheckAnalyzeServiceImpl implements GrainCheckAnalyzeService {
      * @return
      */
     @Override
-    public List<TTestdata> getNewest(String storehouse) {
+    public List<TTestdata> getNewest(String storehouse, String orgId) {
         Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotBlank(storehouse))
+        if (StringUtils.isNotBlank(storehouse)) {
             map.put("storehouse",storehouse);
+        }
+        if (StringUtils.isNotBlank(orgId)) {
+            map.put("orgId",orgId);
+        }
         return tTestdataMapper.getNewest(map);
     }
 
     @Override
-    public List<TTestdata> getByCfCode(String storehouse) {
+    public List<TTestdata> getByCfCode(String storehouse, String orgId) {
         TTestdataExample example = new TTestdataExample();
         TTestdataExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(orgId);
         criteria.andStorehouseEqualTo(storehouse);
         example.setOrderByClause("time desc");
         List<TTestdata> tTestdata = tTestdataMapper.selectByExample(example);

depot-web/src/main/resources/static/app/intelligent/grainInspect/service/realTimeDataService.js

@@ -10,7 +10,8 @@ angular.module('app.intelligent').service("realTimeDataService", function($http,
             params : {
                 pageNum : pageInfo.pageNum,
                 pageSize : pageInfo.pageSize,
-                storehouse : search == undefined ? "":search.storehouse
+                storehouse : search == undefined ? "":search.storehouse,
+                orgId : $rootScope.orgInfo.orgId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码