Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/dto/CustomPermissionDTO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class CustomPermissionDTO {
 
     @ApiModelProperty(value = "自定义权限类型", required = true)
-    private String type;
+    private String bizType;
 
     @ApiModelProperty(value = "代表岗位、部门或个体用户id", required = true)
     private String bizId;

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

@@ -162,7 +162,7 @@ public class InstrumentPanelPermissionImpl
                         p.setId(IdWorker.get32UUID());
                         p.setBizId(x.getBizId());
                         p.setBizName(x.getBizName());
-                        p.setBizType(x.getType());
+                        p.setBizType(x.getBizType());
                         p.setPanelId(panelId);
                         p.setPublished(publishStatus);
                         baseMapper.insert(p);

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());
@@ -207,7 +207,7 @@ public class VariableServiceImpl implements VariableService {
         }else if(AccessType.CUSTOM.value.equals(sendDTO.getAccessType())) {
             if(CollectionUtils.isNotEmpty(sendDTO.getPermissions())){
                 Map<String, List<CustomPermissionDTO>> maps =
-                    sendDTO.getPermissions().stream().collect(Collectors.groupingBy(CustomPermissionDTO::getType));
+                    sendDTO.getPermissions().stream().collect(Collectors.groupingBy(CustomPermissionDTO::getBizType));
                 List<CustomPermissionDTO> departments = maps.get("department");
                 List<CustomPermissionDTO> positions = maps.get("position");
                 List<CustomPermissionDTO> users = maps.get("user");
@@ -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}