fix

smart-city-platform/src/main/java/com/bz/smart_city/entity/Building.java

@@ -9,13 +9,14 @@ import lombok.Data;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
 @ToString
 @ApiModel("建筑")
-public class Building {
+public class Building implements Serializable {
     @ApiModelProperty(value = "id", position = 1)
     private Integer id;
 

smart-city-platform/src/main/java/com/bz/smart_city/entity/Community.java

@@ -3,13 +3,14 @@ package com.bz.smart_city.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
 import lombok.Data;
 
 @ApiModel(value="小区")
 @Data
-public class Community {
+public class Community implements Serializable {
     @ApiModelProperty(value="主键", hidden = true)
     private Integer id;
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/BuildingServiceImpl.java

@@ -1326,7 +1326,7 @@ public class BuildingServiceImpl implements BuildingService {
     }
 
     @Override
-    @Cacheable(value = "CacheBuilding", key = "#siteId + #name")
+    @Cacheable(value = "CacheBuilding", key = "#siteId + #name",unless = "#result == null")
     public Building findCacheByName(Integer siteId, String name) {
         return buildingMapper.findByName(siteId,name);
     }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/CommunityServiceImpl.java

@@ -291,7 +291,7 @@ public class CommunityServiceImpl implements CommunityService{
     }
 
     @Override
-    @Cacheable(value = "CacheCommunity", key = "#siteId + #communityName")
+    @Cacheable(value = "CacheCommunity", key = "#siteId + #communityName",unless = "#result == null")
     public Community findCacheByName(Integer siteId, String communityName) {
         return communityMapper.findByName(siteId,communityName);
     }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -1320,6 +1320,7 @@ public  class DeviceServiceImpl implements DeviceService {
 
     @Override
     public void setValve(Long deviceId) {
+        Device device = deviceMapper.findByDeviceId(deviceId);
         WaterMeterErrorDays waterMeterErrorDays = waterMeterErrorDaysMapper.findByDeviceId(deviceId);
         String sendValveStatus = "0";
 
@@ -1330,7 +1331,7 @@ public  class DeviceServiceImpl implements DeviceService {
                 }
             }
         }
-        Device device = deviceMapper.findByDeviceId(deviceId);
+
         if (device.getUdipId() != null && !"".equals(device.getUdipId())) {
             //1、下发开关阀门
             Map<String,Object> map = new HashMap<>();

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceTypeServiceImpl.java

@@ -233,7 +233,7 @@ public class DeviceTypeServiceImpl implements DeviceTypeService {
     }
 
     @Override
-    @Cacheable(value = "deviceTypeName", key = "#deviceTypeName + #deviceTypeModel")
+    @Cacheable(value = "CacheDeviceType", key = "#deviceTypeName + #deviceTypeModel",unless = "#result == null")
     public DeviceTypeDto getByName(String deviceTypeName,String deviceTypeModel) {
         return deviceTypeMapper.getByName(deviceTypeName,deviceTypeModel);
     }

smart-city-platform/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=sit
+spring.profiles.active=dev

smart-city-platform/src/test/java/com/bz/smart_city/ProtocolParser.java

@@ -13,7 +13,7 @@ public class ProtocolParser {
         Map<String,Object> map = new HashMap<>();
         Map<String,Object> paras = new HashMap<>();
         //paras.put("electronicNo","00202004170001")
-        paras.put("electronicNo","00000190439135");
+        paras.put("electronicNo","00000190439127");
         paras.put("valveStatus", "1");//阀门状态  0：关阀 1：开阀
         map.put("params", paras);
         map.put("method", "WriteValve");

smart-city-platform/src/test/java/com/bz/smart_city/ScTest.java

@@ -1,6 +1,9 @@
 package com.bz.smart_city;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bz.smart_city.commom.util.HttpRequest;
 import com.bz.smart_city.commom.util.Jdk8DateUtils;
 import com.bz.smart_city.commom.util.Util;
 import com.bz.smart_city.dto.DeviceTypeDto;
@@ -13,9 +16,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
 
 import javax.validation.constraints.Null;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -310,6 +315,44 @@ public class ScTest {
         log.info("udipUnit json:"+ json);
     }
 
+    @Test
+    public void downlink(){
+        String url = "http://api.easylinkin.com/api/v1/application/downlink?";
+        Map<String,Object> map = new HashMap<>();
+        map.put("mac","004a77012403af45");
+        map.put("token","huaxu180820");
+        map.put("appeui","2C26C501241E0000");
+        map.put("payload","FEFEFEFE6810279143900100000404A01700551816");
+        map.put("ttl","2h");
+        map.put("payloadType","1");
+        map.put("confirmed",true);
+        String temp = "";
+        for (String key : map.keySet()) {
+            temp += "&" + key + "=" +map.get(key);
+        }
+        url += temp.substring(1);
+        System.out.println(url);
+        try {
+            String result = HttpRequest.doGet(url);
+            System.out.println(result);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Test
+    public void jsonPerTest(){
+        String param = "{\n" +
+                "            \"code\": [\"YFFJK\",\"GDZD\",\"WXYC\",\"YXYC\",\"LORAWM\",\"NBWM\",\"LORAM\",\"QBTGDZD\"]\n" +
+                "        }";
+        JSONObject obj = JSONObject.parseObject(param);
+        //JSONArray list = obj.getJSONArray("code");
+        List<String> list =  JSON.parseArray(obj.getString("code"),String.class);
+        System.out.println(list);
+    }
+
+
 
 
 }