智能仓房气象站增加查询条件

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

@@ -35,6 +35,8 @@ public class RemoteControlUtil {
     public static final String sendOrder = "/intelligents/monitorWarning/sendNumberMonitor";
     // 粮温检测-手动选仓
     public static final String chooseCFCode = "/intelligents/temperatureRecord/sendTemperatureDetection";
+    // 气象实时检测
+    public static final String wertherinfo = "/intelligents/wertherinfo/sendNowWeatherDetection";
     // 粮情全仓检测
     public static final String foodAll = "/intelligents/temperatureRecord/sendTemperatureDetectionAll";
     // 粮情单仓检测

src/main/java/com/chinaitop/depot/intelligent/weather/controller/WeatherManagerController.java

@@ -7,6 +7,7 @@ import com.chinaitop.depot.intelligent.weather.model.TWertherinfo;
 import com.chinaitop.depot.intelligent.weather.service.WeatherManagerService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sun.istack.NotNull;
 import com.unissoft.model.ResponseEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -36,15 +37,16 @@ public class WeatherManagerController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "vqxzname", value = "气象站名称", paramType = "query"),
             @ApiImplicitParam(name = "searchStartDate", value = "开始时间", paramType = "query"),
-            @ApiImplicitParam(name = "searchEndDate", value = "结束时间", paramType = "query")
+            @ApiImplicitParam(name = "searchEndDate", value = "结束时间", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TWeatherhsitory>> getList(Integer pageNum, Integer pageSize, String vqxzname, String searchStartDate, String searchEndDate) {
+    public ResponseEntity<PageInfo<TWeatherhsitory>> getList(Integer pageNum, Integer pageSize, String vqxzname, String searchStartDate, String searchEndDate, @NotNull String orgId) {
         List<TWeatherhsitory> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = weatherManagerService.getList(vqxzname,searchStartDate,searchEndDate);
+            list = weatherManagerService.getList(vqxzname,searchStartDate,searchEndDate,orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询气象列表失败");

src/main/java/com/chinaitop/depot/intelligent/weather/controller/WertherinfoController.java

@@ -1,11 +1,14 @@
 package com.chinaitop.depot.intelligent.weather.controller;
 
+import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.chinaitop.depot.intelligent.socket.SocketClient;
 import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
+import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
 import com.chinaitop.depot.intelligent.weather.model.TWertherinfo;
 import com.chinaitop.depot.intelligent.weather.service.WertherinfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sun.istack.NotNull;
 import com.unissoft.model.ResponseEntity;
 import com.unissoft.model.TypeEnum;
 import io.swagger.annotations.Api;
@@ -15,6 +18,8 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.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;
@@ -28,10 +33,12 @@ import java.util.Map;
 @RequestMapping(value = "/intelligents/wertherinfo")
 @Api(value = "WertherinfoController", description = "气象站设备控制类")
 public class WertherinfoController {
-
+    @Autowired
+    private TemperatureRecordService temperatureRecordService;
     @Resource
     private WertherinfoService wertherinfoService;
-
+    @Resource
+    private RemoteControlUtil remoteControlUtil;
     @Autowired
     private SocketClient socketClient;
 
@@ -42,15 +49,16 @@ public class WertherinfoController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "vqxzname", value = "气象站名称", paramType = "query"),
             @ApiImplicitParam(name = "searchStartDate", value = "开始时间", paramType = "query"),
-            @ApiImplicitParam(name = "searchEndDate", value = "结束时间", paramType = "query")
+            @ApiImplicitParam(name = "searchEndDate", value = "结束时间", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TWertherinfo>> getList(Integer pageNum, Integer pageSize, String vqxzname, String searchStartDate, String searchEndDate) {
+    public ResponseEntity<PageInfo<TWertherinfo>> getList(Integer pageNum, Integer pageSize, String vqxzname, String searchStartDate, String searchEndDate, @NotNull String orgId) {
         List<TWertherinfo> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = wertherinfoService.getList(vqxzname,searchStartDate,searchEndDate);
+            list = wertherinfoService.getList(vqxzname,searchStartDate,searchEndDate,orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询气象站列表失败");
@@ -111,40 +119,52 @@ public class WertherinfoController {
     @ApiOperation(value = "校验是否重复", notes = "校验是否重复")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "vdevcode", value = "设备编码", paramType = "query"),
-            @ApiImplicitParam(name = "vdevname", value = "设备名称", paramType = "query")
+            @ApiImplicitParam(name = "vdevname", value = "设备名称", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query")
     })
-    public ResponseEntity getBycfCode(String vdevcode,String vdevname) {
-        boolean bycfCode = wertherinfoService.getBycfCode(vdevcode, vdevname);
+    public ResponseEntity getBycfCode(String vdevcode,String vdevname,String orgId) {
+        boolean bycfCode = wertherinfoService.getBycfCode(vdevcode, vdevname,orgId);
         return ResponseEntity.ok(bycfCode);
     }
 
     @RequestMapping(value = "/sendNowWeatherDetection", method = RequestMethod.POST)
     @ApiOperation(value = "气象实时检测", notes = "气象实时检测")
-    public ResponseEntity sendNowWeatherDetection() {
+    public ResponseEntity sendNowWeatherDetection( @NotNull String orgId) {
+        // 1.获取库端url
+        String url = temperatureRecordService.getRemoteUrl(orgId);
+        if (org.apache.commons.lang.StringUtils.isBlank(url))
+            return ResponseEntity.failed("库端硬件地址未配置!");
+        // 2.封装请求数据
+        MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
+        //requestEntity.add("storeCode", storeCode);
+        return remoteControlUtil.remoteScan(
+                String.format("%s%s", url, remoteControlUtil.wertherinfo),
+                requestEntity, "POST", null
+        );
        //7E 0005 06 0101 0000000000
-        byte[] b = new byte[11];
-        b[0] = 0x7E;
-        b[1] = 0x00;
-        b[2] = 0x05;
-        b[3] = 0X06;
-        b[4] = 0x01;
-        b[5] = 0x01;
-        b[6] = 0x00;
-        b[7] = 0x00;
-        b[8] = 0x00;
-        b[9] = 0x00;
-        b[10] = 0x00;
-        String result = "";
-        // 发送指令
-        try {
-            String s = socketClient.startClient(b);
-            // 0：失败；1：成功；2：设备通讯异常；3：设备故障；4：未知原因; 5: 本地模式(有的设备有本地模式，即无法远程控制)
-            result = TypeEnum.resultDispose(s);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.ok("设备连接异常!");
-        }
-        return ResponseEntity.ok(result);
+//        byte[] b = new byte[11];
+//        b[0] = 0x7E;
+//        b[1] = 0x00;
+//        b[2] = 0x05;
+//        b[3] = 0X06;
+//        b[4] = 0x01;
+//        b[5] = 0x01;
+//        b[6] = 0x00;
+//        b[7] = 0x00;
+//        b[8] = 0x00;
+//        b[9] = 0x00;
+//        b[10] = 0x00;
+//        String result = "";
+//        // 发送指令
+//        try {
+//            String s = socketClient.startClient(b);
+//            // 0：失败；1：成功；2：设备通讯异常；3：设备故障；4：未知原因; 5: 本地模式(有的设备有本地模式，即无法远程控制)
+//            result = TypeEnum.resultDispose(s);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return ResponseEntity.ok("设备连接异常!");
+//        }
+//        return ResponseEntity.ok(result);
     }
 
     @RequestMapping(value = "/synchronizationAll", method = RequestMethod.GET)

src/main/java/com/chinaitop/depot/intelligent/weather/service/WeatherManagerService.java

@@ -5,5 +5,5 @@ import com.chinaitop.depot.intelligent.weather.model.TWeatherhsitory;
 import java.util.List;
 
 public interface WeatherManagerService {
-    List<TWeatherhsitory> getList(String vqxzname,String searchStartDate,String searchEndDate);
+    List<TWeatherhsitory> getList(String vqxzname,String searchStartDate,String searchEndDate,String orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/weather/service/WertherinfoService.java

@@ -7,7 +7,7 @@ import java.util.Date;
 import java.util.List;
 
 public interface WertherinfoService {
-    List<TWertherinfo> getList(String vqxzname, String searchStartDate, String searchEndDate);
+    List<TWertherinfo> getList(String vqxzname, String searchStartDate, String searchEndDate, String orgId);
 
     TWertherinfo getById(String id);
 
@@ -15,7 +15,7 @@ public interface WertherinfoService {
 
     int deleteById(String id,String wertherinfojson);
 
-    boolean getBycfCode(String vdevcode, String vdevname);
+    boolean getBycfCode(String vdevcode, String vdevname, String orgId);
 
     List<TWeatherhsitory> getByCodeAndTimes(List<String> cDcsCodes, List<Date> cTimes);
 

src/main/java/com/chinaitop/depot/intelligent/weather/service/impl/WeatherManagerServiceImpl.java

@@ -17,7 +17,7 @@ public class WeatherManagerServiceImpl implements WeatherManagerService {
     private TWeatherhsitoryMapper tWeatherhsitoryMapper;
 
     @Override
-    public List<TWeatherhsitory> getList(String vqxzname,String searchStartDate,String searchEndDate) {
+    public List<TWeatherhsitory> getList(String vqxzname,String searchStartDate,String searchEndDate,String orgId) {
         TWeatherhsitoryExample example = new TWeatherhsitoryExample();
         TWeatherhsitoryExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(vqxzname)){
@@ -26,6 +26,9 @@ public class WeatherManagerServiceImpl implements WeatherManagerService {
         if (StringUtils.isNotBlank(searchStartDate) && StringUtils.isNotBlank(searchEndDate)) {
             criteria.andUpdateTimeBetween(DateUtils.stringToData(searchStartDate + DateUtils.startTime), DateUtils.stringToData(searchEndDate + DateUtils.endTime));
         }
+        if (StringUtils.isNotBlank(orgId)){
+            criteria.andOrgIdEqualTo(orgId);
+        }
         example.setOrderByClause("update_time desc");
         List<TWeatherhsitory> tWeatherhsitories = tWeatherhsitoryMapper.selectByExample(example);
         return tWeatherhsitories;

src/main/java/com/chinaitop/depot/intelligent/weather/service/impl/WertherinfoServiceImpl.java

@@ -39,7 +39,7 @@ public class WertherinfoServiceImpl implements WertherinfoService {
     private UuidUtils uUidUtils;
     
     @Override
-    public List<TWertherinfo> getList(String vqxzname, String searchStartDate, String searchEndDate) {
+    public List<TWertherinfo> getList(String vqxzname, String searchStartDate, String searchEndDate, String orgId) {
         TWertherinfoExample example = new TWertherinfoExample();
         TWertherinfoExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(vqxzname)) {
@@ -48,6 +48,9 @@ public class WertherinfoServiceImpl implements WertherinfoService {
         if (StringUtils.isNotBlank(searchStartDate) && StringUtils.isNotBlank(searchEndDate)) {
             criteria.andUpdatetimeBetween(DateUtils.stringToData(searchStartDate + DateUtils.startTime), DateUtils.stringToData(searchEndDate + DateUtils.endTime));
         }
+        if (StringUtils.isNotBlank(orgId)){
+            criteria.andOrgIdEqualTo(orgId);
+        }
         criteria.andDelFlagEqualTo(1);//未删除
         example.setOrderByClause("updatetime desc");
         return tWertherinfoMapper.selectByExample(example);
@@ -106,7 +109,7 @@ public class WertherinfoServiceImpl implements WertherinfoService {
     }
 
     @Override
-    public boolean getBycfCode(String vdevcode, String vdevname) {
+    public boolean getBycfCode(String vdevcode, String vdevname, String orgId) {
         TWertherinfoExample example = new TWertherinfoExample();
         TWertherinfoExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotEmpty(vdevcode)) {
@@ -115,6 +118,9 @@ public class WertherinfoServiceImpl implements WertherinfoService {
         if (StringUtils.isNotEmpty(vdevname)) {
             criteria.andVqxznameEqualTo(vdevname);
         }
+        if (StringUtils.isNotBlank(orgId)){
+            criteria.andOrgIdEqualTo(orgId);
+        }
         List<TWertherinfo> tWertherinfos = tWertherinfoMapper.selectByExample(example);
         if (tWertherinfos.size() > 0) {
             return true;