Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

 Conflicts:

	readme.md

readme.md

@@ -73,4 +73,127 @@ INDEX `index_tenant_id`(`tenant_id`) USING BTREE,
 INDEX `index_device_time`(`device_id`, `state_begin_time`) USING BTREE,
 INDEX `index_device_attr`(`device_id`, `attribute_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 16499 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;
+
+## operation_manager 运维管理数据库
+CREATE TABLE `sc_evaluation_grade` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `COMPANY_ORG_ID` int(11) DEFAULT NULL COMMENT '所属公司',
+  `EVALUATION_GRADE` int(11) DEFAULT NULL COMMENT '绩效等级(0A 1B 2C 3D 4E)',
+  `TYPE` int(11) DEFAULT NULL COMMENT '类型(0大于等于 1小于 2介于)',
+  `VALUE_ONE` DECIMAL(18,2) DEFAULT NULL COMMENT '分值1',
+  `VALUE_TWO` DECIMAL(18,2) DEFAULT NULL COMMENT '分值2',
+  `REMARKS` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '备注',
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评等级';
+CREATE TABLE `sc_evaluation_item` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `COMPANY_ORG_ID` int(11) DEFAULT NULL COMMENT '所属公司',
+  `DEPT_ORG_ID` int(11) DEFAULT NULL COMMENT '所属部门',
+  `TYPE` int(11) DEFAULT NULL COMMENT '类型(0任务完成数 1任务按时完成率 2自定义)',
+  `NAME` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '名称',
+  `VALUE` DECIMAL(18,2) DEFAULT NULL COMMENT '分值',
+  `VALUE_CONDITION` DECIMAL(18,2) DEFAULT NULL COMMENT '条件值',
+  `CYCLE` int(11) DEFAULT NULL COMMENT '周期(0月度 1季度 2年度)',
+  `REMARKS` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '评分标准', 
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评项';
+
+CREATE TABLE `sc_evaluation_item_value` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `EVALUATION_ITEM_ID` int(11) NOT NULL COMMENT '考评项ID',
+  `TYPE` int(11) DEFAULT NULL COMMENT '类型(0大于等于 1小于 2介于)',
+  `VALUE_ONE` DECIMAL(18,2) DEFAULT NULL COMMENT '分值1',
+  `VALUE_TWO` DECIMAL(18,2) DEFAULT NULL COMMENT '分值2',
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评项分值';
+
+CREATE TABLE `sc_evaluation_cycle` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `COMPANY_ORG_ID` int(11) DEFAULT NULL COMMENT '所属公司',
+  `TYPE` int(11) DEFAULT NULL COMMENT '类型(0月度 1季度 2年度)',
+  `EVALUATION_DAY` int(11) DEFAULT NULL COMMENT '考评日期',
+  `REMARKS` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '备注',
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评周期';
+
+CREATE TABLE `sc_evaluation_result` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `COMPANY_ORG_ID` int(11) DEFAULT NULL COMMENT '所属公司',
+  `DEPT_ORG_ID` int(11) DEFAULT NULL COMMENT '所属部门',
+  `EVALUATION_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '考评人',
+  `EVALUATION_BE` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '被考评人',
+  `STATE` int(11) DEFAULT NULL COMMENT '考评状态(0未考评 1已考评)',
+  `CYCLE` int(11) DEFAULT NULL COMMENT '周期(0月度 1季度 2年度)',
+  `YEAR` int(11) DEFAULT NULL COMMENT '考评年份',
+  `MONTH` int(11) DEFAULT NULL COMMENT '考评月份',
+  `EVALUATION_GRADE` int(11) DEFAULT NULL COMMENT '绩效等级(0A 1B 2C 3D 4E)',
+  `VALUE` DECIMAL(18,2) DEFAULT NULL COMMENT '考评得分',
+  `DATE_START` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '考评开始时间',
+  `DATE_END` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '考评结束时间',
+  `DATE_EVALUATION` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '考评时间', 
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评结果';
+CREATE TABLE `sc_evaluation_result_task` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `EVALUATION_RESULT_ID` int(11) NOT NULL COMMENT '考评结果ID',
+  `TOTAL_COUNT` int(11) DEFAULT NULL COMMENT '任务总数',
+  `COMPLETE_COUNT` int(11) DEFAULT NULL COMMENT '已完成',
+  `NO_COMPLETE_COUNT` int(11) DEFAULT NULL COMMENT '待完成',
+  `DELAY_COMPLETE_COUNT` int(11) DEFAULT NULL COMMENT '延期完成',
+  `COMPLETION_RATE` decimal(18,2) DEFAULT NULL COMMENT '完成率',
+  `DELAY_RATE` decimal(18,2) DEFAULT NULL COMMENT '延期率',
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评结果任务详情';
+CREATE TABLE `sc_evaluation_result_details` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `TENANT_ID` varchar(100) DEFAULT NULL COMMENT '租户标识',
+  `EVALUATION_RESULT_ID` int(11) NOT NULL COMMENT '考评结果ID',
+  `EVALUATION_ITEM_ID` int(11) NOT NULL COMMENT '考评项ID',
+  `VALUE` DECIMAL(18,2) DEFAULT NULL COMMENT '考评得分',
+  `STATUS` smallint(6) DEFAULT NULL COMMENT '数据删除标记',
+  `DATE_CREATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `CREATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人',
+  `DATE_UPDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `UPDATE_BY` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1 COMMENT='考评结果任务详情';
+
+
+

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -130,7 +130,7 @@ public class MonitorInfoController {
         for (MonitorInfoEntity item : page) {
             if (item.getMonitorType().equals(0L)) {
                 //查询报警信息
-                List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(item.getDeviceId().intValue());
+                List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(id,item.getDeviceId().intValue());
                 Map<Integer, AlarmDetailsDto> mapAlarm = new HashMap<>();
                 //将缓存中的实时数据放到map中方便进行遍历
                 for (AlarmDetailsDto alarmDetailsDto : alarmDetailsDtos) {

sms_water/src/main/java/com/huaxu/dao/AlarmDetailMapper.java

@@ -27,7 +27,7 @@ public interface AlarmDetailMapper {
      * @param deviceId
      * @return
      */
-    List<AlarmDetailsDto> selectByDeviceId(Integer deviceId);
+    List<AlarmDetailsDto> selectByDeviceId(@Param("sceneId")Long sceneId,@Param("deviceId")Integer deviceId);
 
 
     /**

sms_water/src/main/java/com/huaxu/service/AlarmDetailsService.java

@@ -25,7 +25,7 @@ public interface AlarmDetailsService {
      * 查询单个设备
      * @return
      */
-    List<AlarmDetailsDto> selectByDeviceId(Integer deviceId);
+    List<AlarmDetailsDto> selectByDeviceId(Long sceneId,Integer deviceId);
     /**
      * 按场景查询
      * @return

sms_water/src/main/java/com/huaxu/service/AppDataService.java

@@ -128,7 +128,7 @@ public class AppDataService {
             if (!deviceCodes.contains(deviceParmEntity.getDeviceCode())) {
                 deviceCodes.add(deviceParmEntity.getDeviceCode());
                 //查询报警信息
-                List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(deviceParmEntity.getDeviceId());
+                List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(id,deviceParmEntity.getDeviceId());
                 alarms.put(deviceParmEntity.getDeviceCode(), alarmDetailsDtos);
                 List<DeviceParmEntity> deviceParms = new ArrayList<>();
                 deviceParms.add(deviceParmEntity);

sms_water/src/main/java/com/huaxu/service/impl/AlarmDetailsServiceImpl.java

@@ -61,8 +61,8 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
     }
 
     @Override
-    public List<AlarmDetailsDto> selectByDeviceId(Integer deviceId) {
-        return alarmDetailMapper.selectByDeviceId(deviceId);
+    public List<AlarmDetailsDto> selectByDeviceId(Long sceneId,Integer deviceId) {
+        return alarmDetailMapper.selectByDeviceId(sceneId,deviceId);
     }
 
     @Override

sms_water/src/main/java/com/huaxu/service/impl/DeviceParmServiceImpl.java

@@ -16,10 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @description 设备参数
@@ -192,14 +189,14 @@ public class DeviceParmServiceImpl  implements DeviceParmService {
             }
             //查询已经绑定的所有参数
             List<DeviceParmInfoDto> deviceParmInfoList = deviceParmMapper.selectBindByDeviceId(sceneId, deviceId);
-            List<Long> ids = new ArrayList<>();
+            Map<Long,Long> idMaps= new HashMap<>();
             for (DeviceParmInfoDto info : deviceParmInfoList) {
-                ids.add(info.getId());
+                idMaps.put(Long.valueOf(info.getAttributeId()),info.getId());
             }
             for (DeviceParmInfoDto item : deviceParmInfos) {
-                if (ids.contains(item.getAttributeId().longValue())) {
-                    ids.remove(item.getAttributeId().longValue());
-                } else if (!ids.contains(item.getAttributeId().longValue())) {
+                if (idMaps.containsKey(item.getAttributeId().longValue())) {
+                    idMaps.remove(item.getAttributeId().longValue());
+                } else if (!idMaps.containsKey(item.getAttributeId().longValue())) {
                     //新增
                     DeviceParmEntity deviceParmEntity = new DeviceParmEntity();
                     deviceParmEntity.setSceneId(sceneId);
@@ -216,7 +213,7 @@ public class DeviceParmServiceImpl  implements DeviceParmService {
                 }
             }
             //将ids 移除
-            for(Long id : ids) {
+            for(Long id : idMaps.values()) {
                 deviceParmMapper.deleteById(id.intValue());
             }
         }

sms_water/src/main/resources/mapper/AlarmDetailMapper.xml

@@ -682,7 +682,7 @@
         left join sms_alarm_setting b on a.alarm_setting_id=b.id and b.status = 1 and b.alarm_condition!='='
         <include refid="alarmDetailJoins"/>
         where a.`STATUS` = 1
-        and a.DEVICE_ID=#{deviceId} and a.state=1
+        and a.DEVICE_ID=#{deviceId} and a.scene_id=#{sceneId} and a.state=1
     </select>
 
     <select id="getAlarmInfoForWorkOrderManage" resultType="com.huaxu.dto.DeviceAlarmInfoForOrder">

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -440,7 +440,7 @@
     </select>
     <!--查询设备地图参数数据-->
     <select id="selectDeviceMapParam" resultMap="deviceDataMap">
-        select distinct t1.id device_id,t1.device_code,t1.device_name,t1.point_x,point_y,t1.address,t2.attribute_id, ifnull(t2.remark, t3.`name`) attribute_name,t3.unit,
+        select distinct t1.id device_id,t1.device_code,t1.device_name,t1.point_x,point_y,t1.address,t2.attribute_id, ifnull(t2.remark, t3.`name`) attribute_name,t3.unit,t2.parm_type attribute_type,
          t2.seq,case when t2.attribute_id is  null then null when t6.id is null then 0 else 1 end is_alarm,concat(t11.alarm_condition,cast(t11.alarm_value as char)+0) alarm_range
         <if test="flag == null or flag ==0">
             ,if (t4.alarm_count>0, 1, 0) device_state
@@ -655,7 +655,7 @@
             </if>
             from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
         )t7 on t7.scene_id=t2.scene_id and t7.device_id=t2.device_id
-        left join sms_device_parm t8 on t8.scene_id = t2.scene_id and t8.device_id=t2.device_id and t8. status = 1 and t8.is_suspension = 1
+        left join sms_device_parm t8 on t8.device_id=t2.device_id and t8. status = 1 and t8.is_suspension = 1
         left join sms_device_attribute t9 on t8.attribute_id=t9.id and t9.status = 1
         left join sms_alarm_details t10 on t10.scene_id=t2.scene_id and t10.device_id=t2.device_id and t10.attribute_id=t8.attribute_id and t10.status = 1 and t10.state=1
         left join sms_alarm_setting t11 on t10.alarm_setting_id=t11.id and t11.status = 1 and t11.alarm_condition!='='

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -236,6 +236,7 @@ public class UserServiceImpl implements UserService {
         String key = null;
         try {
             // 验证加密的内容是否正确
+            encryptValue=encryptValue.replaceAll(" ","+");
             key = DESUtil.decrypt(encryptValue,appSecret);
             // 截取里面的时间
             String date = key.substring(key.lastIndexOf("_") + 1, key.length());

user_center/src/main/java/com/huaxu/entity/UserEntity.java

@@ -111,6 +111,9 @@ public class UserEntity implements Serializable {
     /** 备注 */
     @ApiModelProperty(value = "备注")
     private String remark;
+    /** 备注 */
+    @ApiModelProperty(value = "平台用户唯一id")
+    private String uniqId;
 
     /** 用户角色 */
     @ApiModelProperty(value = "用户角色")
@@ -133,4 +136,5 @@ public class UserEntity implements Serializable {
     @ApiModelProperty(value="用户权限类型")
     @TableField(exist = false)
     private Integer permissonType;
+
 }

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -1,6 +1,7 @@
 package com.huaxu.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.common.ToolUtil;
 import com.huaxu.dao.OrgMapper;
@@ -16,12 +17,18 @@ import com.huaxu.util.ByteArrayUtils;
 import com.huaxu.util.RedisUtil;
 import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import javax.annotation.Resource;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -45,6 +52,8 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 	private OrgMapper orgMapper;
 	@Autowired
 	private RedisUtil redisUtil;
+	@Value("${add_iot_user_url}")
+	private String addIotUserUrl;
 
 	/**
 	 * 自定义分页查询，含关联实体对像
@@ -135,6 +144,7 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 	 * 保存
 	 */
 	public boolean addUser(UserEntity user) {
+		user.setUniqId(UUID.randomUUID().toString());
 		if (this.save(user)) {
 			Long pkId = user.getId();
 			//添加用户标签
@@ -163,9 +173,30 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 				userRoleEntity.setUserId(pkId);
 				userRoleService.addUserRole(userRoleEntity);
 			}
+			addIotUser(user);
 			return true;
 		}
 		return false;
+	}
+	private void addIotUser(UserEntity userEntity){
+		try {
+			HttpHeaders headers = new HttpHeaders();
+			JSONObject args=new JSONObject();
+			args.put("username",userEntity.getUsername());
+			args.put("mobilePhone",userEntity.getPhone());
+			args.put("tenantId",userEntity.getTenantId());
+			args.put("uniqId",userEntity.getUniqId());
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			HttpEntity<String> formEntity = new HttpEntity<>(args.toJSONString(), headers);
+
+			RestTemplate restTemplate=new RestTemplate();
+			restTemplate.postForEntity(addIotUserUrl, formEntity,String.class);
+		 }catch (Exception e){
+			log.error("添加物联网用户失败",e);
+		}
+
+
+
 	}
 
 	/**

user_center/src/main/resources/application-dev.properties

@@ -84,13 +84,12 @@ dispath.routing.key=dipathKey
 ribbon.OkToRetryOnAllOperations=false
 ribbon.ReadTimeout=5000:
 ribbon.ConnectTimeout=3000
-
-
-
 # 设置 feign 客户端超时时间（OpenFeign 默认支持 ribbon）
 # 值的是建立连接所用的时间，使用与网络状态正常的情况，两端连接所用的时间
-ribbon.ReadTimeout=5000
+
 # 指的是建立连接后从服务器读取到可用资源所用的时间
 ribbon.ConnectionTimeout=5000
+add_iot_user_url=http://localhost:8090/api/integration/user/savePlatformUser
+
 
 

user_center/src/main/resources/application-sit.properties

@@ -79,7 +79,7 @@ spring.rabbitmq.template.mandatory=true
 receive.exchange.name=messageExchangeTest
 dispath.routing.key=dipathKeyTest1
 dispath.queue=dispathTest1
-
+add_iot_user_url=http://114.135.61.188:58080/api/integration/user/savePlatformUser