增加orgId

src/main/java/com/chinaitop/depot/intelligent/IntelligentDetection/controller/IntelligentBatchDetectionController.java

@@ -53,15 +53,16 @@ public class IntelligentBatchDetectionController {
             @ApiImplicitParam(name = "pageSize", defaultValue = "10", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "tName", value = "机构id", paramType = "query"),
             @ApiImplicitParam(name = "tState", value = "是否开启", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query"),
             @ApiImplicitParam(name = "tCategory", value = "检测类型", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TTimingTask>> getList(Integer pageNum, Integer pageSize, String tName, String tState, String tCategory) {
+    public ResponseEntity<PageInfo<TTimingTask>> getList(Integer pageNum, Integer pageSize, String tName, String tState, String tCategory,String orgId) {
         List<TTimingTask> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = tTimingTaskService.getList(tName,tState,tCategory);
+            list = tTimingTaskService.getList(tName,tState,tCategory,orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());
@@ -134,15 +135,16 @@ public class IntelligentBatchDetectionController {
             @ApiImplicitParam(name = "vcfcode", value = "仓房code", paramType = "query"),
             @ApiImplicitParam(name = "time", value = "更新时间", paramType = "query"),
             @ApiImplicitParam(name = "tid", value = "检测id", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "所属类型", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TTimingTaskHistory>> getDetectionHistory(Integer pageNum, Integer pageSize, String vcfcode, String time, String tid,String type) {
+    public ResponseEntity<PageInfo<TTimingTaskHistory>> getDetectionHistory(Integer pageNum, Integer pageSize, String vcfcode, String time, String tid,String type,String orgId) {
         List<TTimingTaskHistory> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = tTimingTaskService.getDetectionHistory(vcfcode,time,tid,type);
+            list = tTimingTaskService.getDetectionHistory(vcfcode,time,tid,type,orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());

src/main/java/com/chinaitop/depot/intelligent/IntelligentDetection/service/TTimingTaskService.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public interface TTimingTaskService {
 
-    List<TTimingTask> getList(String tName, String tState, String tCategory);
+    List<TTimingTask> getList(String tName, String tState, String tCategory,String orgId);
 
     void save(String taskSchemaJson);
 
@@ -20,5 +20,5 @@ public interface TTimingTaskService {
 
     TTimingTask getById(String id);
 
-    List<TTimingTaskHistory> getDetectionHistory(String vcfcode, String time, String tid,String type);
+    List<TTimingTaskHistory> getDetectionHistory(String vcfcode, String time, String tid,String type,String orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/IntelligentDetection/service/impl/TTimingTaskServiceImpl.java

@@ -40,7 +40,7 @@ public class TTimingTaskServiceImpl implements TTimingTaskService {
 
 
     @Override
-    public List<TTimingTask> getList(String tName, String tState, String tCategory) {
+    public List<TTimingTask> getList(String tName, String tState, String tCategory,String orgId) {
         TTimingTaskExample example = new TTimingTaskExample();
         TTimingTaskExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(tName)) {
@@ -52,6 +52,9 @@ public class TTimingTaskServiceImpl implements TTimingTaskService {
         if (StringUtils.isNotBlank(tCategory)) {
             criteria.andTCategoryEqualTo(tCategory);
         }
+        if (StringUtils.isNotBlank(orgId)) {
+            criteria.andOrgIdEqualTo(orgId);
+        }
         example.setOrderByClause("t_update_time desc");
         return tTimingTaskMapper.selectByExample(example);
     }
@@ -104,7 +107,7 @@ public class TTimingTaskServiceImpl implements TTimingTaskService {
     }
 
     @Override
-    public List<TTimingTaskHistory> getDetectionHistory(String vcfcode, String time, String tid, String type) {
+    public List<TTimingTaskHistory> getDetectionHistory(String vcfcode, String time, String tid, String type,String orgId) {
         TTimingTaskHistoryExample example = new TTimingTaskHistoryExample();
         TTimingTaskHistoryExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(vcfcode)){
@@ -119,6 +122,9 @@ public class TTimingTaskServiceImpl implements TTimingTaskService {
         if (StringUtils.isNotBlank(type)){
             criteria.andTCategoryEqualTo(type);
         }
+        if (StringUtils.isNotBlank(orgId)){
+            criteria.andOrgIdEqualTo(orgId);
+        }
         example.setOrderByClause("t_update_time desc");
         List<TTimingTaskHistory> tTimingTaskHistories = tTimingTaskHistoryMapper.selectByExample(example);
         return tTimingTaskHistories;