集成良安的测温服务

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

@@ -23,6 +23,8 @@ public interface TemperatureRecordService {
     void insertBatch(List<TTestdata> testData);
 
     List<TTestdata> getByCodeAndTimes(List<String> cDcsCodes,List<Date> cTimes,List<String> lqTypes);
+    
+    List<TTestdata> findByConditions(String storehouseCode, Date cTimes, String lqTypes);
 
     String getOrgId (String cfCode);
 

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

@@ -201,6 +201,20 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
     }
 
     @Override
+	public List<TTestdata> findByConditions(String storehouseCode, Date cTimes, String lqTypes) {
+    	TTestdataExample example = new TTestdataExample();
+    	TTestdataExample.Criteria criteria = example.createCriteria();
+    	if (StringUtils.isNotBlank(storehouseCode) && cTimes != null && StringUtils.isNotBlank(lqTypes)) {
+            criteria.andStorehouseEqualTo(storehouseCode);
+            criteria.andTimeEqualTo(cTimes);
+            criteria.andIlqYqEqualTo(lqTypes);
+            List<TTestdata> tTestdata = tTestdataMapper.selectByExample(example);
+            return tTestdata;
+        }
+        return null;
+	}
+
+    @Override
     public String getOrgId(String cfCode) {
         return tTestdataMapper.getOrgId(cfCode);
     }
@@ -287,9 +301,11 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         } else {////给佳华发送指令
             DataGatherCenterService dataGatherCenterService = SendEntity.grainWs();
             if (StringUtils.isNotBlank(storeCode)) {
-            	s = dataGatherCenterService.sendTemperatureDetection("");
-            } else {
+            	logger.info("(嘉华)发送测温指令参数是:"+storeCode);
             	s = dataGatherCenterService.sendTemperatureDetection(storeCode);
+            } else {
+            	logger.info("(嘉华)发送测温指令参数是:空,为全仓检测");
+            	s = dataGatherCenterService.sendTemperatureDetection("");
             }
             logger.info("(嘉华)发送测温指令后返回结果:"+s);
             if (s.contains(":0")){

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/LongRangeUtils.java

@@ -12,13 +12,13 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.chinaitop.depot.intelligent.basicdata.model.SysSerial;
-import com.chinaitop.depot.intelligent.basicdata.model.TWarningThreshold;
 import com.chinaitop.depot.intelligent.basicdata.service.SysSerialService;
 import com.chinaitop.depot.intelligent.basicdata.service.WarningThresholdService;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TTestdataLayerMapper;
@@ -30,7 +30,6 @@ import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLog;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataPoints;
-import com.chinaitop.depot.intelligent.grainsituation.model.TWarningThresholdHistory;
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.google.common.collect.Lists;
 
@@ -110,16 +109,17 @@ public class LongRangeUtils {
             List<Date> cTimes = tts.stream().map(TTestdata::getTime).collect(Collectors.toList());
             List<String> lqTypes = tts.stream().map(TTestdata::getIlqYq).collect(Collectors.toList());
             //校验重复数据
-            List<TTestdata> byCodeAndTimes = temperatureRecordService.getByCodeAndTimes(cDcsCodes, cTimes, lqTypes);
-            if (byCodeAndTimes != null && byCodeAndTimes.size() > INT_ZERO) {
-                logger.info("上传数据重复！");
-                return;
-            }
-            String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(INT_ZERO));
-            if (null != orgId && !"".equals(orgId)) {
-            	ts.forEach(obj -> {
+//            List<TTestdata> byCodeAndTimes = temperatureRecordService.getByCodeAndTimes(cDcsCodes, cTimes, lqTypes);
+//            if (byCodeAndTimes != null && byCodeAndTimes.size() > INT_ZERO) {
+//                logger.info("上传数据重复！");
+//                return;
+//            }
+//            String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(INT_ZERO));
+//            if (null != orgId && !"".equals(orgId)) {
+            	for (int i = 0; i < ts.size(); i++) { 
+            	//ts.forEach(obj -> {
             		String testdataId = UuidUtils.getCode();
-            		TTestdata tTestdata = (TTestdata) obj;
+            		TTestdata tTestdata = (TTestdata) ts.get(i);
             		String house = tTestdata.getStorehouse();
             		Date time = tTestdata.getTime();
             		List<TPoints> ps = tTestdata.getPoints();
@@ -135,6 +135,20 @@ public class LongRangeUtils {
             				.replace("x:", "")
             				.replace("y:", "")
             				.replace("z:", "");
+
+            		//检查仓房编号是否可识别
+            		String orgId = temperatureRecordService.getOrgId(house);
+            		if (StringUtils.isBlank(orgId)) {
+            			logger.info("仓房编号为"+house+"的数据无法识别，所以跳过不保存！");
+            			continue;
+            		}
+            		//校验重复数据
+            		List<TTestdata> byCodeAndTimes = temperatureRecordService.findByConditions(house, time, tTestdata.getIlqYq());
+            		if (byCodeAndTimes != null && byCodeAndTimes.size() > INT_ZERO) {
+                        logger.info("storehouse为"+house+",time为"+ParameterUtil.date2YMDHMS(time)+",ilqYq为"+tTestdata.getIlqYq()+"的数据已存在，所以不保存！");
+                        continue;
+                    }
+            		
             		//获取报警阈值信息6972测温 6983温度高限 6982温度底限 6991温度预警
 //            		TWarningThreshold threshold = null; //温度高限
 //            		TWarningThreshold wLowest = null; //温度底限
@@ -396,7 +410,7 @@ public class LongRangeUtils {
             				}
             			}*/
             		}
-            	});
+            	}
             	if (tTestdataList.size() > INT_ZERO) {
             		temperatureRecordService.insertBatch(tTestdataList);
             	}
@@ -410,9 +424,10 @@ public class LongRangeUtils {
             		tTestdataPointsMapper.insertBatch(points_list);
             	}
             	logger.info("测温数据入库业务表成功");
-            } else {
-            	logger.info("返回数据后存储异常：未获取到orgId值，所以不保存数据！");
-            }
+//            }
+//            else {
+//            	logger.info("返回数据后存储异常：未获取到orgId值，所以不保存数据！");
+//            }
 
         } catch (Exception e) {
             logger.info("测温异常：" + e.getMessage());

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/ParameterUtil.java

@@ -79,6 +79,12 @@ public class ParameterUtil {
         return str;
     }
 
+    public static String date2YMDHMS(Date date){
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String str=sdf.format(date);
+        return str;
+    }
+
     /**
      * 获取指定时间的时间戳
      * @param datatime
@@ -109,54 +115,7 @@ public class ParameterUtil {
     }
 
     public static void main(String[] args) {
-    	for (int l=0;l<3;l++) {
-    		String redisKey = "20230422";
-    		RedisUtil re = new RedisUtil();
-    		List<Object> values = null;
-    		boolean flag = re.hasKey("aa");
-    		if (!flag) {
-    			//缓存中的数据为空 则生成0000- 9999放到缓存
-    	        values = new ArrayList<>();
-    	        int i = 0;
-    	        while (i <= 5){
-    	            values.add(String.format("%1$04d", i));
-    	            i++;
-    	        }
-    	        //放入redis缓存
-    	        re.lSet(redisKey, values, getRemainSecondsOneDay(new Date()));
-    	        //设置键位redisKey的缓存在凌晨的时候过期
-    	        //re.expire(redisKey,getRemainSecondsOneDay(new Date()));
-    		} else {
-    			values = re.lGetAll(redisKey);
-    		}
-    		Random random = new Random();
-    		int index = random.nextInt(values.size() - 1);
-    	    String code = (String) values.get(index);
-    	    //删除已经使用的编号 
-    	    values.remove(index);
-    	    //重新更新
-    	    re.setRemove(redisKey, code);
-//    		List<Object> values = re.lGetAll(redisKey);
-//    	    if(CollectionUtils.isEmpty(values)){
-//    	        //缓存中的数据为空 则生成0000- 9999放到缓存
-//    	        values = new ArrayList<>();
-//    	        int i = 0;
-//    	        while (i <= 5){
-//    	            values.add(String.format("%1$04d", i));
-//    	            i++;
-//    	        }
-//    	    }
-//    	    //生成0 ~ values长度 随机数
-//    	    Random random = new Random();
-//    	    int index = random.nextInt(values.size() - 1);
-//    	    String code = (String) values.get(index);
-//    	    //删除已经使用的编号 更新到缓存中
-//    	    values.remove(index);
-//    	    re.setRemove(redisKey, code);
-
-    		//System.out.println(code);
-    	}
-		
+    	System.out.println(date2YMDHMS(new Date()));
     }
     
     public static Integer getRemainSecondsOneDay(Date currentDate) {

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/createKC.java

@@ -41,7 +41,8 @@ public class createKC {
 		JSONObject object = null;
 		try {
 			logger.info("准备请求webservice...");
-			logger.info(url);
+			logger.info("地址："+url);
+			logger.info("参数："+parameters);
 			res = client.invoke(opName, parameters);
 			object = JSONObject.fromObject(res[0]);
 			logger.info("调用webservice后返回结果：" + object.toString());