diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java
index 96b7c2d32292ba5e6a83a2b844c2d1846e0f1728..a6d1f19464fed4a599ddce90518bc670232d5389 100644
--- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java
+++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java
@@ -142,7 +142,7 @@ public class SyncUserImpl implements ISyncUser {
         addRoom = new JSONObject();
         addRoom.put("id", 1);
         addRoom.put("uid", 1);
-        addRoom.put("name", "管理处");  //修改物业中心名称
+        addRoom.put("name", "9999");  //修改物业中心名称
         addRoom.put("num", "9909-909");//添加楼栋单元号
 		String ysfjh="";
 		String thfjh="";
diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java
index f148482b70f5cf5b5880a685fc68173bcdb47ed4..5f221c0cc0a473b01d17f4f845a388f60a0795c7 100644
--- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java
+++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java
@@ -174,30 +174,46 @@ public class YiteSmartHal {
      * @param request
      * @return
      */
+	
+	
     @RequestMapping(path = "/device/v1/gate/getSwitch", method = RequestMethod.GET)
     public ResponseEntity<String> getSwitch(HttpServletRequest request) {
+		Map<String, String> headers = new HashMap<>();
+		RequestUtils.initHeadParam(request, headers);
+		RequestUtils.initUrlParam(request, headers);
+		JSONObject reqJson = JSONObject.parseObject(headers.get("header"));
+		
+		String uuId = reqJson.getString("uuid");
+		
+		AccessControlDto accessControlDto = new AccessControlDto();
+		accessControlDto.setMachineCode(uuId);
+		List<AccessControlDto> accessControlDtos = accessControlV1InnerServiceSMOImpl.queryAccessControls(accessControlDto);
+		String getSwitchs = accessControlDtos.get(0).getRemark();
+		if(getSwitchs.split("-", 17).length != 17){
+			getSwitchs = "0-0-1-1-0-1-0-1-1-0-0-0-0-0-0-1-3";
+		}
         JSONObject paramOut = new JSONObject();
         paramOut.put("code", 200);
         paramOut.put("msg", "");
         paramOut.put("timestamp", DateUtil.getCurrentDate().getTime());
         JSONObject data = new JSONObject();
-        data.put("gate_button_password", "0");
-        data.put("gate_button_phone", "0");
-        data.put("gate_button_room", "1");
-        data.put("gate_button_room_input", "1");
-        data.put("gate_call_manager", "0");
-        data.put("gate_capture_picture", "1");
-        data.put("gate_check_face_switch", "1");
-        data.put("gate_open_face", "1");
-        data.put("gate_qr_pwd_state", "1");
-        data.put("gate_register_face", "0");
-        data.put("health_qr_code_switch", "0");
-        data.put("pop_ad_switch", "0");
-        data.put("property_fee_switch", "0");
-        data.put("stranger_captures", "0");
-        data.put("alarm_switch", "0");
-        data.put("gate_log_open", 1);
-        data.put("gate_log_cycle", 3);
+        data.put("gate_button_password", getSwitchs.split("-", 17)[0]); //门禁机密码开门开关
+        data.put("gate_button_phone", getSwitchs.split("-", 17)[1]); //手机号呼叫开门开关
+        data.put("gate_button_room", getSwitchs.split("-", 17)[2]); //房间号呼叫开门开关
+        data.put("gate_button_room_input", getSwitchs.split("-", 17)[3]); //输入房间号呼叫开门开关
+        data.put("gate_call_manager", getSwitchs.split("-", 17)[4]); //门禁呼叫管理处开关
+        data.put("gate_capture_picture", getSwitchs.split("-", 17)[5]); //开门抓拍图片是否上传开关
+        data.put("gate_check_face_switch", getSwitchs.split("-", 17)[6]); //活体检测开关
+        data.put("gate_open_face", getSwitchs.split("-", 17)[7]); //门禁机人脸识别开关
+        data.put("gate_qr_pwd_state", getSwitchs.split("-", 17)[8]); //扫码开门开关
+        data.put("gate_register_face", getSwitchs.split("-", 17)[9]); //门禁机注册人脸开关
+        data.put("health_qr_code_switch", getSwitchs.split("-", 17)[10]);
+        data.put("pop_ad_switch", getSwitchs.split("-", 17)[11]); //弹屏广告开关
+        data.put("property_fee_switch", getSwitchs.split("-", 17)[12]);
+        data.put("stranger_captures", getSwitchs.split("-", 17)[13]); //陌生人抓拍开关
+        data.put("alarm_switch", getSwitchs.split("-", 17)[14]); //防拆报警开关
+        data.put("gate_log_open", getSwitchs.split("-", 17)[15]); //日志开关
+        data.put("gate_log_cycle", getSwitchs.split("-", 17)[16]); //日志保存周期
         paramOut.put("data", data);
         logger.debug("登陆返回报文：{}", paramOut.toString());
         return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java
index 9c8cd2b9ec83afd69f2b5c0dd2f338ea358a23d5..d4fe55948a3b9ce2221987e4da37a984840c4645 100644
--- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java
+++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java
@@ -133,7 +133,7 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo {
         addRoom = new JSONObject();
         addRoom.put("id", 1);
         addRoom.put("uid", 1);
-        addRoom.put("name", "管理处");//修改物业中心名称
+        addRoom.put("name", "9999");//修改物业中心名称
         addRoom.put("num", "9909-909");//添加楼栋单元号
         users = new JSONArray();
         addRoom.put("user", users);