在查询方法中添加orgId条件

src/main/java/com/DatePermissionInterceptor.java

@@ -32,8 +32,8 @@ import java.util.Set;
 /**
  * Sql执行时间记录拦截器
  */
-@Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class })})
-@Component
+//@Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class })})
+//@Component
 public class DatePermissionInterceptor implements Interceptor {
 	
 	private static final ObjectFactory DEFAULT_OBJECT_FACTORY = new DefaultObjectFactory();

src/main/java/com/chinaitop/depot/intelligent/utils/RemoteControlUtil.java

@@ -57,6 +57,9 @@ public class RemoteControlUtil {
     public static final String onlyPest = "/intelligents/insectPestDetection/sendOnlyInsectPestDetection";
     // 能耗检测
     public static final String energyOrder = "/intelligents/energyDetection/addHistoryData";
+    
+    // 粮温检测-手动选仓
+    public static final String xzSave = "/intelligents/aerationRecord/save";
 
     /**
      * 远程库端请求方法

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AeratioCompareController.java

@@ -1,24 +1,23 @@
 package com.chinaitop.depot.intelligent.ventilation.controller;
 
 
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationCompareService;
-import com.chinaitop.depot.intelligent.ventilation.service.AerationJobService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.unissoft.model.ResponseEntity;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 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.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/intelligents/aerationCompare")
@@ -32,13 +31,13 @@ public class AeratioCompareController {
     @RequestMapping(value = "/getJobTime", method = RequestMethod.GET)
     @ApiOperation(value = "根据仓房获取通风作业的时间", notes = "根据仓房获取通风作业的时间")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "vCfCode", value = "仓房的code", paramType = "query")
+            @ApiImplicitParam(name = "vCfCode", value = "仓房的code", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
     })
-    public ResponseEntity<List<TJob>> getJobTime(String vCfCode) {
+    public ResponseEntity<List<TJob>> getJobTime(String vCfCode, @NotNull String orgId) {
         List<TJob> list = null;
         try {
-            
-            list = aerationCompareService.getJobTime(vCfCode);
+            list = aerationCompareService.getJobTime(vCfCode, Integer.parseInt(orgId));
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
@@ -47,13 +46,4 @@ public class AeratioCompareController {
         return ResponseEntity.ok(list);
      }
 
-    
-   
-
-    
-
-    
-    
-    
-    
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationJobController.java

@@ -1,27 +1,32 @@
 package com.chinaitop.depot.intelligent.ventilation.controller;
 
 
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationJobService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.unissoft.model.ResponseEntity;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 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.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/intelligents/aerationJob")
 @Api(value = "AerationJobController", description = "通风作业")
+@SuppressWarnings("all")
 public class AerationJobController {
 
     @Autowired
@@ -50,7 +55,6 @@ public class AerationJobController {
         return ResponseEntity.ok(pageInfo);
     }
 
-    
     @RequestMapping(value = "/getById", method = RequestMethod.POST)
     @ApiOperation(value = "根据id查询信息", notes = "根据id查询信息")
     @ApiImplicitParams({
@@ -66,12 +70,15 @@ public class AerationJobController {
         return ResponseEntity.ok(tJob);
     }
 
-    @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "applyJobJson", value = "表数据json串", paramType = "form")
+        @ApiImplicitParam(name = "applyJobJson", value = "表数据json串", paramType = "form"),
+        @ApiImplicitParam(name = "taskNumber", value = "通风任务单号", paramType = "form"),
+        @ApiImplicitParam(name = "creator", value = "创建人", paramType = "form"),
+        @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "form")
     })
-    public ResponseEntity save(String applyJobJson, String taskNumber, String creator,Integer orgId) {
+    public ResponseEntity save(String applyJobJson, String taskNumber, String creator, @NotNull Integer orgId) {
         try {
         	aerationJobService.save(applyJobJson,taskNumber,creator,orgId);
         } catch (Exception e) {

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationParameterController.java

@@ -20,9 +20,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.constraints.NotNull;
+
 @RestController
 @RequestMapping(value = "/intelligents/aerationParameter")
 @Api(value = "AerationParameterController", description = "通风参数值设置")
+@SuppressWarnings("all")
 public class AerationParameterController {
 
     @Autowired
@@ -34,10 +37,10 @@ public class AerationParameterController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "库点编码", paramType = "query"),
-            @ApiImplicitParam(name = "vcfcode", value = "仓库名称", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "库点ID", paramType = "query"),
+            @ApiImplicitParam(name = "vcfcode", value = "仓房编号", paramType = "query")
     })
-   public ResponseEntity<PageInfo<TCtldevinfo>> getList(Integer pageNum, Integer pageSize, String orgId, String vcfcode) {
+   public ResponseEntity<PageInfo<TCtldevinfo>> getList(Integer pageNum, Integer pageSize, @NotNull String orgId, String vcfcode) {
         List<TCtldevinfo> list = null;
         try {
             if (null != pageNum && null != pageSize) {
@@ -68,12 +71,13 @@ public class AerationParameterController {
         return ResponseEntity.ok(tCtldevinfo);
     }
 
-    @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "aerationParameterJson", value = "表数据json串", paramType = "form")
+            @ApiImplicitParam(name = "aerationParameterJson", value = "表数据json串", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "库点ID", paramType = "form")
     })
-    public ResponseEntity save(String aerationParameterJson,Integer orgId) {
+    public ResponseEntity save(String aerationParameterJson, @NotNull Integer orgId) {
         try {
         	aerationParameterService.save(aerationParameterJson,orgId);
         } catch (Exception e) {
@@ -86,8 +90,8 @@ public class AerationParameterController {
     @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
     @ApiOperation(value = "根据粮情id删除粮油信息", notes = "根据粮情id删除粮油信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "粮情id", paramType = "query"),
-            @ApiImplicitParam(name = "aerationParamJson", value = "通风参数json字符串", paramType = "query")
+            @ApiImplicitParam(name = "id", value = "粮情id", paramType = "form"),
+            @ApiImplicitParam(name = "aerationParamJson", value = "通风参数json字符串", paramType = "form")
     })
     public ResponseEntity deleteById(String id, String aerationParamJson) {
         if (StringUtils.isNotBlank(id)) {
@@ -111,9 +115,10 @@ public class AerationParameterController {
     @ApiOperation(value = "根据id查询信息", notes = "根据id查询信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "vcfcode", value = "仓房code", paramType = "query"),
-            @ApiImplicitParam(name = "vdevkindcode", value = "设备类型", paramType = "query")
+            @ApiImplicitParam(name = "vdevkindcode", value = "设备类型", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
-    public ResponseEntity<List<TCtldevinfo>> getBycf(String vcfcode,String vdevkindcode) {
+    public ResponseEntity<List<TCtldevinfo>> getBycf(String vcfcode,String vdevkindcode, @NotNull Integer orgId) {
     	List<TCtldevinfo> list = null;
     	Map<String, Object> modelMap = new HashMap<>();
     	if(StringUtils.isNotBlank(vdevkindcode)){
@@ -122,6 +127,9 @@ public class AerationParameterController {
     	if(StringUtils.isNotBlank(vcfcode)){
     		modelMap.put("vcfcode", vcfcode);
     	}
+    	if (null != orgId) {
+    		modelMap.put("orgId", orgId);
+    	}
         list = aerationParameterService.getBycf(modelMap);
         return ResponseEntity.ok(list);
     }

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationRecordController.java

@@ -1,9 +1,26 @@
 package com.chinaitop.depot.intelligent.ventilation.controller;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.chinaitop.depot.intelligent.socket.SocketClient;
 import com.chinaitop.depot.intelligent.utils.ConstUtils;
 import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
 import com.chinaitop.depot.intelligent.utils.ParameterUtil;
+import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
 import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
 import com.chinaitop.depot.intelligent.ventilation.model.TVentilation;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationParameterService;
@@ -14,20 +31,13 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.unissoft.model.ResponseEntity;
 import com.unissoft.model.TypeEnum;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 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.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
 
+@SuppressWarnings("all")
 @RestController
 @RequestMapping(value = "/intelligents/aerationRecord")
 @Api(value = "AerationRecordController", description = "通风记录控制类")
@@ -45,15 +55,18 @@ public class AerationRecordController {
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "vDevKindCode", value = "设备类型", paramType = "query"),
-            @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query")
+            @ApiImplicitParam(name = "vCfCode", value = "仓房编号", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "仓房编号", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode,String type) {
+    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode,String type,
+    		@NotNull String orgId) {
         List<TVentilation> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = aerationRecordService.getList(vCfCode, vDevKindCode,type);
+            list = aerationRecordService.getList(vCfCode, vDevKindCode,type, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
@@ -65,8 +78,13 @@ public class AerationRecordController {
     @Autowired
     private SocketClient socketClient;
 
-  //新增
-    @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @Autowired
+    private TemperatureRecordService temperatureRecordService;
+
+    @Resource
+    private RemoteControlUtil remoteControlUtil;
+
+	@RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "task", value = "所有id的Sting", paramType = "form"),
@@ -74,63 +92,79 @@ public class AerationRecordController {
             @ApiImplicitParam(name = "orgId", value = "当前登录人组织id", paramType = "form"),
             @ApiImplicitParam(name = "saveType", value = "存储类型", paramType = "form")
     })
-    public ResponseEntity save(String task, String aerationTaskControl, Integer orgId, String saveType) {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
-        String result = "";
-        try {
-            //注意，这里如果打开通风设备关闭不了的话请查看---通风操作打开的需要通风操作关闭，熏蒸操作并不能管理通风操作的通风设备。
-            if (ParameterUtil.isnotnull(saveType) && ParameterUtil.isequal(saveType, "fumigationData")) {//新增熏蒸的通风控制
-                aerationRecordService.saveFumigation(task, aerationTaskControl, orgId);
-            } else {//新增通风控制
-                // 通风指令发送
-            	
-            	if(task!=null){
-            		
-            		String devinfo = "";
-            		if(!task.contains("[") && !task.contains("]")){
-            		   devinfo = "["+task+"]";  //task 包括id和vstatue
-            		}else{
-            			devinfo = task;
-            		}
-            		List<TCtldevinfo> idObject = mapper.readValue(devinfo, new TypeReference<List<TCtldevinfo>>() {});
-            		TCtldevinfo tCtldevinfo = new TCtldevinfo();
-	                for(int i = 0;i<idObject.size();i++){
-	                    tCtldevinfo = aerationParameterService.getById(idObject.get(i).getId());
-	                    tCtldevinfo.setvState(Integer.valueOf(idObject.get(i).getVstatue()));
-                        String dir = ConstUtils.directiveJoint("00", tCtldevinfo.getVcfcode(), tCtldevinfo.getVdevcode(), tCtldevinfo.getVdevkindcode(), "0" + tCtldevinfo.getVstatue(), "");
-	                    System.out.println(dir);
-	                    // 16进制字符串转byte数组
-	                    byte[] bytes = HexConvertUtils.hexStringToByte(dir);
-	                    // 发送指令
-	                    String soc = socketClient.startClient(bytes);
-	                    result = TypeEnum.resultDispose(soc);
-	                    if(TypeEnum.S_SOH.getDesc().equals(result) && tCtldevinfo.getvState()!=Integer.valueOf(tCtldevinfo.getVstatue())){
-	                    	aerationRecordService.save(tCtldevinfo, aerationTaskControl, orgId);
-	                    }
-	                    Thread.currentThread().sleep(2000);
-	                }
-            	}
-            	
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.failed("设备连接异常！！");
-        }
-        return ResponseEntity.ok(result);
+    public ResponseEntity save(String task, String aerationTaskControl, @NotNull Integer orgId, String saveType) {
+    	
+    	// 1.获取库端url
+        String url = temperatureRecordService.getRemoteUrl(orgId.toString());
+        if (StringUtils.isBlank(url))
+            return ResponseEntity.failed("库端硬件地址未配置!");
+        // 2.封装请求数据
+        MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
+        requestEntity.add("task", task);
+        requestEntity.add("aerationTaskControl", aerationTaskControl);
+        requestEntity.add("orgId", orgId);
+        requestEntity.add("saveType", saveType);
+        return remoteControlUtil.remoteScan(
+                String.format("%s%s", url, remoteControlUtil.xzSave),
+                requestEntity, "POST", null
+        );
+    	
+//        ObjectMapper mapper = new ObjectMapper();
+//        mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+//        String result = "";
+//        try {
+//            //注意，这里如果打开通风设备关闭不了的话请查看---通风操作打开的需要通风操作关闭，熏蒸操作并不能管理通风操作的通风设备。
+//            if (ParameterUtil.isnotnull(saveType) && ParameterUtil.isequal(saveType, "fumigationData")) {//新增熏蒸的通风控制
+//                aerationRecordService.saveFumigation(task, aerationTaskControl, orgId);
+//            } else {//新增通风控制
+//                // 通风指令发送
+//            	
+//            	if(task!=null){
+//            		
+//            		String devinfo = "";
+//            		if(!task.contains("[") && !task.contains("]")){
+//            		   devinfo = "["+task+"]";  //task 包括id和vstatue
+//            		}else{
+//            			devinfo = task;
+//            		}
+//            		List<TCtldevinfo> idObject = mapper.readValue(devinfo, new TypeReference<List<TCtldevinfo>>() {});
+//            		TCtldevinfo tCtldevinfo = new TCtldevinfo();
+//	                for(int i = 0;i<idObject.size();i++){
+//	                    tCtldevinfo = aerationParameterService.getById(idObject.get(i).getId());
+//	                    tCtldevinfo.setvState(Integer.valueOf(idObject.get(i).getVstatue()));
+//                        String dir = ConstUtils.directiveJoint("00", tCtldevinfo.getVcfcode(), tCtldevinfo.getVdevcode(), tCtldevinfo.getVdevkindcode(), "0" + tCtldevinfo.getVstatue(), "");
+//	                    System.out.println(dir);
+//	                    // 16进制字符串转byte数组
+//	                    byte[] bytes = HexConvertUtils.hexStringToByte(dir);
+//	                    // 发送指令
+//	                    String soc = socketClient.startClient(bytes);
+//	                    result = TypeEnum.resultDispose(soc);
+//	                    if(TypeEnum.S_SOH.getDesc().equals(result) && tCtldevinfo.getvState()!=Integer.valueOf(tCtldevinfo.getVstatue())){
+//	                    	aerationRecordService.save(tCtldevinfo, aerationTaskControl, orgId);
+//	                    }
+//	                    Thread.currentThread().sleep(2000);
+//	                }
+//            	}
+//            	
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return ResponseEntity.failed("设备连接异常！！");
+//        }
+//        return ResponseEntity.ok();
     }
 
-    //根据仓房和设备名称查询通风的记录
     @RequestMapping(value = "/getByCode", method = RequestMethod.POST)
     @ApiOperation(value = "根据仓房和设备名称查询信息", notes = "根据仓房和设备名称查询信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "vcfcode", value = "vcfcode", paramType = "query"),
-            @ApiImplicitParam(name = "vdevname", value = "vdevname", paramType = "query")
+            @ApiImplicitParam(name = "vdevname", value = "vdevname", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
-    public ResponseEntity<TVentilation> getById(String vcfcode, String vdevname) {
+    public ResponseEntity<TVentilation> getById(String vcfcode, String vdevname, @NotNull String orgId) {
         TVentilation tVentilation = null;
         if (StringUtils.isNotBlank(vcfcode) && StringUtils.isNotBlank(vcfcode)) {
-            tVentilation = aerationRecordService.getByCode(vcfcode, vdevname);
+            tVentilation = aerationRecordService.getByCode(vcfcode, vdevname, orgId);
         } else {
             return ResponseEntity.failed("ID数据有误!");
         }

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationTaskController.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.constraints.NotNull;
+
 @RestController
 @RequestMapping(value = "/intelligents/aerationTask")
 @Api(value = "AerationTaskController", description = "通风计划申请类")
@@ -47,9 +49,13 @@ public class AerationTaskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "state", value = "通风状态", paramType = "query")
+            @ApiImplicitParam(name = "tJobApplication", value = "通风申请记录数据对象", paramType = "query"),
+            @ApiImplicitParam(name = "approvalState", value = "approvalState", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TJobApplication>> getList(Integer pageNum, Integer pageSize, TJobApplication tJobApplication , Integer approvalState,Integer userId,Integer orgId) {
+    public ResponseEntity<PageInfo<TJobApplication>> getList(Integer pageNum, Integer pageSize, TJobApplication tJobApplication, 
+    		Integer approvalState,Integer userId, @NotNull Integer orgId) {
         List<TJobApplication> list = null;
         try {
             if (null != pageNum && null != pageSize) {
@@ -239,7 +245,7 @@ public class AerationTaskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "state", value = "通风状态", paramType = "query")
+            @ApiImplicitParam(name = "tJobApplication", value = "参数对象", paramType = "query")
     })
     public ResponseEntity<PageInfo<TJobApplication>> getJobCtrlList(Integer pageNum, Integer pageSize,TJobApplication tJobApplication) {
         List<TJobApplication> list = null;
@@ -247,12 +253,13 @@ public class AerationTaskController {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            Map<String,String> map = new HashMap<String,String>();
+            Map<String, Object> map = new HashMap<String, Object>();
             String vcfCode = null;
             if(null != tJobApplication.getvCfCode()  && tJobApplication.getvCfCode() != ""){
             	 vcfCode = tJobApplication.getvCfCode();
             }
             map.put("vcfCode", vcfCode);
+            map.put("orgId", tJobApplication.getOrgId());
             list = aerationTaskService.getJobCtrlList(map);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TCtldevinfoMapper.xml

@@ -355,6 +355,6 @@
   <select id="selectBycf" parameterType="java.util.Map" resultMap="BaseResultMap">
   	select <include refid="Base_Column_List" />
     from t_ctldevinfo  where 
-    vcfcode = #{vcfcode,jdbcType=VARCHAR} and vdevkindcode = #{vdevkindcode,jdbcType=VARCHAR}
+    vcfcode = #{vcfcode,jdbcType=VARCHAR} and vdevkindcode = #{vdevkindcode,jdbcType=VARCHAR} and org_id = #{orgId,jdbcType=INTEGER}
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TJobApplicationMapper.java

@@ -100,7 +100,7 @@ public interface TJobApplicationMapper {
     
     List<TJobApplicationAudit> getApprovalList(Map<String, Object> paramMap);
 
-	List<TJobApplication> getJobCtrlList(Map<String, String> map);
+	List<TJobApplication> getJobCtrlList(Map<String, Object> map);
 
 	TJobApplication getHouseByNumber(String aerationPlanNumber);
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TJobApplicationMapper.xml

@@ -851,7 +851,7 @@
   <select id="getJobCtrlList" parameterType="java.util.Map" resultMap="approvalResultMap">
   	select * from t_job_application t
   	where areation_plan_number in 
-  	(select aeration_plan_number from t_job) 
+  	(select aeration_plan_number from t_job where org_id = #{orgId,jdbcType=INTEGER}) 
   	 <if test="vcfCode != null">
   	 	and	t.v_cf_code= #{vcfCode}
   	 </if>

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TJobMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.intelligent.ventilation.mapper;
 import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 import com.chinaitop.depot.intelligent.ventilation.model.TJobExample;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -27,7 +29,7 @@ public interface TJobMapper {
 
 	int deleteByPrimaryKey(String id);
 
-	List<TJob> getJobTime(String vCfCode);
+	List<TJob> getJobTime(Map<String, Object> map);
 
 	TJob selectByPrimaryKey(String id);
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TJobMapper.xml

@@ -271,7 +271,7 @@
   </update>
   
   
-  <select id="getJobTime" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="getJobTime" parameterType="java.util.Map" resultMap="BaseResultMap">
 	  	SELECT
 		<include refid="Base_Column_List" />
 	FROM
@@ -282,8 +282,9 @@
 				areation_plan_number
 			FROM
 				t_job_application
-			WHERE
-				v_cf_code = #{vCfCode,jdbcType=VARCHAR}
+			WHERE 1=1
+				and v_cf_code = #{vCfCode,jdbcType=VARCHAR}
+				and org_id = #{orgId,jdbcType=INTEGER}
 		)
 	ORDER BY
 		task_end_time DESC

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TVentilationMapper.xml

@@ -1015,6 +1015,6 @@
     select
     <include refid="Base_Column_List" />
     from t_ventilation
-    where v_cf_code = #{vcfcode,jdbcType=VARCHAR} and v_dev_name = #{vdevname,jdbcType=VARCHAR}
+    where v_cf_code = #{vcfcode,jdbcType=VARCHAR} and v_dev_name = #{vdevname,jdbcType=VARCHAR} and org_id = #{orgId,jdbcType=VARCHAR}
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/TCtldevinfo.java

@@ -1,9 +1,11 @@
 package com.chinaitop.depot.intelligent.ventilation.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Range;
+
 public class TCtldevinfo {
     private String id;
 
@@ -30,6 +32,8 @@ public class TCtldevinfo {
 
     private String vstatue;
 
+    @NotNull(message = "组织机构ID不能为空")
+    @Range(max = 10,min = 1)
     private Integer orgId;
 
     private Integer delFlag;

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/TJob.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.intelligent.ventilation.model;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 public class TJob {
     private String id;
 
@@ -21,6 +23,7 @@ public class TJob {
 
     private String operator;
 
+    @NotNull
     private Integer orgId;
 
     /**

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/TVentilation.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.intelligent.ventilation.model;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class TVentilation {
@@ -19,6 +21,7 @@ public class TVentilation {
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
+    @NotNull(message = "单位ID不能为空")
     private String orgId;
 
     /**

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationCompareService.java

@@ -6,8 +6,6 @@ import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 
 public interface AerationCompareService {
 
-	List<TJob> getJobTime(String vCfCode);
-
-    
+	List<TJob> getJobTime(String vCfCode, Integer orgId);
 
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationRecordService.java

@@ -1,20 +1,19 @@
 package com.chinaitop.depot.intelligent.ventilation.service;
 
-import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
-import com.chinaitop.depot.intelligent.ventilation.model.TVentilation;
-
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
+import com.chinaitop.depot.intelligent.ventilation.model.TVentilation;
+
 public interface AerationRecordService {
-    List<TVentilation> getList(String vCfCode, String vDevKindCode,String type);
+    List<TVentilation> getList(String vCfCode, String vDevKindCode,String type, String orgId);
 
 	void save(TCtldevinfo tCtldevinfo, String aerationTaskControl, Integer orgId);
 
 	void saveFumigation(String task, String aerationTaskControl, Integer orgId);
 
-	TVentilation getByCode(String vcfcode, String vdevname);
+	TVentilation getByCode(String vcfcode, String vdevname, String orgId);
 
 	void insertBatch(List<TVentilation> ventilations);
 	 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationTaskService.java

@@ -20,7 +20,7 @@ public interface AerationTaskService {
 
 	TJobApplication getById(String id);
 
-	List<TJobApplication> getJobCtrlList(Map<String, String> map);
+	List<TJobApplication> getJobCtrlList(Map<String, Object> map);
 
 	TJobApplication getHouseByNumber(String aerationPlanNumber);
 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationCompareServiceImpl.java

@@ -5,7 +5,9 @@ import com.chinaitop.depot.intelligent.ventilation.mapper.TJobMapper;
 import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationCompareService;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,16 +22,11 @@ public class AerationCompareServiceImpl implements AerationCompareService {
     
     //获取仓房对应的作业时间
 	@Override
-	public List<TJob> getJobTime(String vCfCode) {
-		// TODO Auto-generated method stub
-		return tJobMapper.getJobTime(vCfCode);
+	public List<TJob> getJobTime(String vCfCode, Integer orgId) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("vCfCode", vCfCode);
+		map.put("orgId", orgId);
+		return tJobMapper.getJobTime(map);
 	}
 
-	
-	
-
-   
-
-   
-
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationJobServiceImpl.java

@@ -1,22 +1,19 @@
 package com.chinaitop.depot.intelligent.ventilation.service.impl;
 
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
 import com.chinaitop.depot.intelligent.utils.UuidUtils;
-import com.chinaitop.depot.intelligent.ventilation.mapper.TCtldevinfoMapper;
 import com.chinaitop.depot.intelligent.ventilation.mapper.TJobMapper;
-import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
-import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfoExample;
 import com.chinaitop.depot.intelligent.ventilation.model.TJob;
 import com.chinaitop.depot.intelligent.ventilation.model.TJobApplication;
 import com.chinaitop.depot.intelligent.ventilation.model.TJobExample;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationJobService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class AerationJobServiceImpl implements AerationJobService {
@@ -46,18 +43,17 @@ public class AerationJobServiceImpl implements AerationJobService {
 
 	@Override
 	public List<TJob> getList(TJob tJob) {
-		// TODO Auto-generated method stub
 		TJobExample tJobExample = new TJobExample();
 		TJobExample.Criteria criteria = tJobExample.createCriteria();
-		
-        
+
+		criteria.andOrgIdEqualTo(tJob.getOrgId());
+
         if (StringUtils.isNotBlank(tJob.getTaskNumber())) {
         	criteria.andTaskNumberLike("%" + tJob.getTaskNumber() + "%");
         }
-        
+
         tJobExample.setOrderByClause(" creation_time desc"); //创建时间
-        
-        //tCtldevinfoExample.setOrderByClause("v_update_time desc");
+
         return tJobMapper.selectByExample(tJobExample);
         
 	}
@@ -70,7 +66,6 @@ public class AerationJobServiceImpl implements AerationJobService {
 
 	@Override
 	public TJob getById(String id) {
-		// TODO Auto-generated method stub
 		return tJobMapper.selectByPrimaryKey(id);
 	}
 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationParameterServiceImpl.java

@@ -1,5 +1,15 @@
 package com.chinaitop.depot.intelligent.ventilation.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.intelligent.basicdata.service.WareHouseBasicInfoService;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
@@ -10,15 +20,6 @@ import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfoExample;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationParameterService;
 import com.unissoft.model.BasicEntity;
 import com.unissoft.model.SendEntity;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 @Service
 public class AerationParameterServiceImpl implements AerationParameterService {
@@ -100,7 +101,6 @@ public class AerationParameterServiceImpl implements AerationParameterService {
 	//根据id查找
 	@Override
 	public TCtldevinfo getById(String id) {
-		// TODO Auto-generated method stub
 		return tCtldevinfoMapper.selectByPrimaryKey(id);
 	}
 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationRecordServiceImpl.java

@@ -1,5 +1,16 @@
 package com.chinaitop.depot.intelligent.ventilation.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.intelligent.fumigation.model.TFumigationPlan;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
@@ -7,18 +18,12 @@ import com.chinaitop.depot.intelligent.utils.UuidUtils;
 import com.chinaitop.depot.intelligent.ventilation.mapper.TCtldevinfoMapper;
 import com.chinaitop.depot.intelligent.ventilation.mapper.TJobMapper;
 import com.chinaitop.depot.intelligent.ventilation.mapper.TVentilationMapper;
-import com.chinaitop.depot.intelligent.ventilation.model.*;
-import com.chinaitop.depot.intelligent.ventilation.service.AerationParameterService;
+import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
+import com.chinaitop.depot.intelligent.ventilation.model.TJob;
+import com.chinaitop.depot.intelligent.ventilation.model.TJobApplication;
+import com.chinaitop.depot.intelligent.ventilation.model.TVentilation;
+import com.chinaitop.depot.intelligent.ventilation.model.TVentilationExample;
 import com.chinaitop.depot.intelligent.ventilation.service.AerationRecordService;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.IOException;
-import java.util.*;
 
 
 
@@ -30,13 +35,13 @@ public class AerationRecordServiceImpl implements AerationRecordService {
     private TJobMapper tJobMapper;
     @Autowired
     private TCtldevinfoMapper tCtldevinfoMapper;
-    @Autowired
-    private AerationParameterService aerationParameterService;
+//    @Autowired
+//    private AerationParameterService aerationParameterService;
 
    
 
     @Override
-    public List<TVentilation> getList(String vCfCode, String vDevKindCode,String type) {
+    public List<TVentilation> getList(String vCfCode, String vDevKindCode,String type, String orgId) {
     	TVentilationExample tVentilationExample = new TVentilationExample();
     	tVentilationExample.setDistinct(true);
     	TVentilationExample.Criteria criteria = tVentilationExample.createCriteria();
@@ -49,6 +54,7 @@ public class AerationRecordServiceImpl implements AerationRecordService {
         if(type!=null && type.equals("0")){
         	criteria.andVDevNameEqualTo("0");//手动增加的记录
         }
+        criteria.andOrgIdEqualTo(orgId);
         tVentilationExample.setOrderByClause("v_update_time desc");
         return tVentilationMapper.selectByExample(tVentilationExample);
     }
@@ -125,7 +131,6 @@ public class AerationRecordServiceImpl implements AerationRecordService {
 	//新增熏蒸的通风控制
 	@Override
 	public void saveFumigation(String task, String fumigationDate,Integer orgId) {
-		// TODO Auto-generated method stub
 		TVentilation tVentilation = new TVentilation();
 		if (StringUtils.isNotBlank(fumigationDate) && StringUtils.isNotBlank(task)) {
 			TCtldevinfo tCtldevinfo = new TCtldevinfo();
@@ -207,11 +212,11 @@ public class AerationRecordServiceImpl implements AerationRecordService {
 
 	//根据仓房和设备名称获取信息
 	@Override
-	public TVentilation getByCode(String vcfcode, String vdevname) {
-		// TODO Auto-generated method stub
+	public TVentilation getByCode(String vcfcode, String vdevname, String orgId) {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		modelMap.put("vcfcode", vcfcode);
 		modelMap.put("vdevname", vdevname);
+		modelMap.put("orgId", orgId);
 		return tVentilationMapper.getByCode(modelMap);
 	}
 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationTaskServiceImpl.java

@@ -30,7 +30,6 @@ public class AerationTaskServiceImpl implements AerationTaskService {
 	 */
 	@Override
 	public List<TJobApplication> getList(TJobApplication tJobApplication, Integer approvalState,Integer userId,Integer orgId) {
-		// TODO Auto-generated method stub
 		TJobApplicationExample tJobApplicationExample = new TJobApplicationExample();
 		tJobApplicationExample.setDistinct(true);
 		TJobApplicationExample.Criteria criteria = tJobApplicationExample.createCriteria();
@@ -52,6 +51,7 @@ public class AerationTaskServiceImpl implements AerationTaskService {
 					criteria.andAidEqualTo(String.valueOf(userId));
 				}
         		criteria.andStateNotEqualTo(4);
+        		criteria.andOrgIdEqualTo(orgId);
         	}
         }
         tJobApplicationExample.setOrderByClause("apply_time desc");
@@ -140,8 +140,7 @@ public class AerationTaskServiceImpl implements AerationTaskService {
 
 
 	@Override
-	public List<TJobApplication> getJobCtrlList(Map<String, String> map) {
-		// TODO Auto-generated method stub
+	public List<TJobApplication> getJobCtrlList(Map<String, Object> map) {
 		return tJobApplicationMapper.getJobCtrlList(map);
 	}