修改变量相关接口

src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java

@@ -43,10 +43,10 @@ public class VariableServiceImpl implements VariableService {
         Map<String,String> p = Maps.newHashMap();
         p.put("appId",appId);
         p.put("token",token);
-        p.put("from",null);
+        p.put("from",variableDTO.getSourceId());
         p.put("varType",null);
         p.put("type",null);
-        p.put("equipmentId",null);
+        p.put("equipmentId",variableDTO.getDeviceId());
         p.put("customerId",null);
         p.put("name",variableDTO.getVariableName());
         p.put("desc",variableDTO.getDescription());
@@ -245,7 +245,6 @@ public class VariableServiceImpl implements VariableService {
             }
 
         }
-        //# todo 准备下发接口
 
         Map<String, Object> commandMap = sendDTO.getCommandMap();
         if(CollectionUtils.isEmpty(commandMap)){

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: slm-bi
   profiles:
     active:
-      - local
+      - dev
   freemarker:
     cache: false
     template-loader-path: classpath:/templates/ftl/
@@ -64,4 +64,4 @@ dc_client:
     send : /{appId}/variables/monitor/device/commands
     variableStatus : /{appId}/variables/{deviceId}/{variableCode}/status
     variableHistoryStatus : /{appId}/variables/{deviceId}/{variableCode}/history-status?startTime={startTime}&endTime={endTime}
-    historyCurve : /{appId}/variables/history?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
+    historyCurve : /{appId}/variables/history-curve?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}