智能仓房添加查询条件-2

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

@@ -87,10 +87,10 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "vCfCode", value = "库房编码", paramType = "query"),
             @ApiImplicitParam(name = "vDatatime", value = "测温时间", paramType = "query")
     })
-    public ResponseEntity findByHouseAndTime(String lqId, String vCfCode, String vDatatime) {
+    public ResponseEntity findByHouseAndTime(String lqId, String vCfCode, String vDatatime, String orgId) {
         List<TTestdataLayer> tTestdataLayer = null;
         try {
-            tTestdataLayer = temperatureRecordService.findByHouseAndTime(lqId, vCfCode, vDatatime);
+            tTestdataLayer = temperatureRecordService.findByHouseAndTime(lqId, vCfCode, vDatatime, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询失败");
@@ -145,13 +145,13 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
     public ResponseEntity<PageInfo<TTestdata>> getComparisonLeft(Integer pageNum, Integer pageSize, String vCfCodeLeft,
-                                                                 String startTimeLeft, String endTimeLeft, String tType) {
+                                                                 String startTimeLeft, String endTimeLeft, String tType, String orgId) {
         List<TTestdata> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = temperatureRecordService.getComparison(vCfCodeLeft, startTimeLeft, endTimeLeft, null, null, null, tType);
+            list = temperatureRecordService.getComparison(vCfCodeLeft, startTimeLeft, endTimeLeft, null, null, null, tType, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());
@@ -181,13 +181,13 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
     public ResponseEntity<PageInfo<TTestdata>> getComparisonRight(Integer pageNum, Integer pageSize, String vCfCodeRight,
-                                                                  String startTimeRight, String endTimeRight, String tType) {
+                                                                  String startTimeRight, String endTimeRight, String tType, String orgId) {
         List<TTestdata> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = temperatureRecordService.getComparison(null, null, null, vCfCodeRight, startTimeRight, endTimeRight, tType);
+            list = temperatureRecordService.getComparison(null, null, null, vCfCodeRight, startTimeRight, endTimeRight, tType, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());
@@ -214,13 +214,13 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "storehouse", value = "仓库编号", paramType = "query"),
             @ApiImplicitParam(name = "id", value = "粮情,水分id", paramType = "query")
     })
-    public ResponseEntity<PageInfo<Map<String, Object>>> getGrainPointAll(Integer pageNum, Integer pageSize, String storehouse, String time, String id) {
+    public ResponseEntity<PageInfo<Map<String, Object>>> getGrainPointAll(Integer pageNum, Integer pageSize, String storehouse, String time, String id, String orgId) {
         List<Map<String, Object>> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = tpointsService.getGrainPointAll(storehouse, time, id);
+            list = tpointsService.getGrainPointAll(storehouse, time, id, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());

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

@@ -457,6 +457,9 @@
       <if test="startTime != null and endTime != null">
         AND time BETWEEN #{startTime} AND #{endTime}
       </if>
+      <if test="orgId != null">
+        AND org_id = #{orgId}
+      </if>
       <if test="lqIds != null">
         AND id IN
         <foreach item="lqId" index="index" collection="lqIds" open="(" separator="," close=")">

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

@@ -13,6 +13,6 @@ import java.util.Map;
  */
 public interface TPointsService {
 
-    List<Map<String,Object>> getGrainPointAll(String storehouse, String time, String id);
+    List<Map<String,Object>> getGrainPointAll(String storehouse, String time, String id, String orgId);
 
 }

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

@@ -11,11 +11,11 @@ import java.util.List;
 public interface TemperatureRecordService {
     List<TTestdata> getList(String vCfCode, String vDatatime, String startTime, String endTime,String tType,String orgId);
 
-    List<TTestdataLayer> findByHouseAndTime(String lqId,String vCfCode, String vDatatime);
+    List<TTestdataLayer> findByHouseAndTime(String lqId,String vCfCode, String vDatatime, String orgId);
 
     ArrayList<Object> findByHouseAndTimes(String lqId,String vCfCode, String vDatatime, boolean viewFlag);
 
-    List<TTestdata> getComparison(String vCfCodeLeft, String startTimeLeft, String endTimeLeft, String vCfCodeRight, String startTimeRight, String endTimeRight, String tType);
+    List<TTestdata> getComparison(String vCfCodeLeft, String startTimeLeft, String endTimeLeft, String vCfCodeRight, String startTimeRight, String endTimeRight, String tType, String orgId);
 
     void insertBatch(List<TTestdata> testData);
 

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

@@ -27,8 +27,11 @@ public class TPointsServiceImpl implements TPointsService {
     private TTestdataMapper tTestdataMapper;
 
     @Override
-    public List<Map<String, Object>> getGrainPointAll(String storehouse, String time, String id) {
+    public List<Map<String, Object>> getGrainPointAll(String storehouse, String time, String id, String orgId) {
         Map<String, Object> map = new HashMap<>();
+        if (StringUtils.isNotBlank(orgId)) {
+            map.put("orgId", orgId);
+        }
         if (StringUtils.isNotBlank(storehouse)) {
             map.put("tHouse", storehouse);
         }

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

@@ -52,7 +52,7 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
 
 
     @Override
-    public List<TTestdataLayer> findByHouseAndTime(String lqId, String vCfCode, String vDatatime) {
+    public List<TTestdataLayer> findByHouseAndTime(String lqId, String vCfCode, String vDatatime, String orgId) {
         TTestdataLayerExample tTestdataLayerExample = new TTestdataLayerExample();
         tTestdataLayerExample.setDistinct(true);
         TTestdataLayerExample.Criteria criteria = tTestdataLayerExample.createCriteria();
@@ -62,6 +62,8 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
             criteria.andLhouseEqualTo(vCfCode);
         if (StringUtils.isNotBlank(vDatatime))
             criteria.andLtimeEqualTo(DateUtils.stringToData(vDatatime));
+        if (StringUtils.isNotBlank(orgId))
+            criteria.andOrgIdEqualTo(orgId);
         tTestdataLayerExample.setOrderByClause("layerNumber ASC");
         List<TTestdataLayer> tTestdata = tTestdataLayerMapper.selectByExample(tTestdataLayerExample);
         return tTestdata;
@@ -107,7 +109,7 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
     }
 
     @Override
-    public List<TTestdata> getComparison(String vCfCodeLeft, String startTimeLeft, String endTimeLeft, String vCfCodeRight, String startTimeRight, String endTimeRight, String tType) {
+    public List<TTestdata> getComparison(String vCfCodeLeft, String startTimeLeft, String endTimeLeft, String vCfCodeRight, String startTimeRight, String endTimeRight, String tType, String orgId) {
         TTestdataExample example = new TTestdataExample();
         example.setDistinct(true);
         TTestdataExample.Criteria criteria = example.createCriteria();
@@ -127,6 +129,8 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         } else {
             criteria.andTimeBetween(DateUtils.stringToData(DateUtils.formatDate(DateUtils.getDate()) + DateUtils.startTime), DateUtils.stringToData(DateUtils.formatDate(DateUtils.getDate()) + DateUtils.endTime));
         }
+        if (StringUtils.isNotBlank(orgId))
+            criteria.andOrgIdEqualTo(orgId);
         // 检测类型0测温，1粮油,2测水分
         criteria.andIlqYqEqualTo(tType);
         example.setOrderByClause("time desc");