更新

iHotel_student_houtai/src/main/java/com/template/auto/controller/UnlockingEmployeeController.java

@@ -0,0 +1,21 @@
+package com.template.auto.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 员工添加钥匙 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-19
+ */
+@RestController
+@RequestMapping("/auto/unlocking-employee")
+public class UnlockingEmployeeController {
+
+}
+

iHotel_student_houtai/src/main/java/com/template/auto/mapper/UnlockingEmployeeMapper.java

@@ -0,0 +1,16 @@
+package com.template.auto.mapper;
+
+import com.template.auto.model.UnlockingEmployee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 员工添加钥匙 Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-19
+ */
+public interface UnlockingEmployeeMapper extends BaseMapper<UnlockingEmployee> {
+
+}

iHotel_student_houtai/src/main/java/com/template/auto/mapper/xml/UnlockingEmployeeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.auto.mapper.UnlockingEmployeeMapper">
+
+</mapper>

iHotel_student_houtai/src/main/java/com/template/auto/model/UnlockingEmployee.java

@@ -0,0 +1,89 @@
+package com.template.auto.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 员工添加钥匙
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="UnlockingEmployee对象", description="员工添加钥匙")
+public class UnlockingEmployee implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "员工添加钥匙")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "名字")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "房间号id")
+    private String houseNumberId;
+
+    @ApiModelProperty(value = "类型（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）")
+    private String type;
+
+    @ApiModelProperty(value = "锁用户id（每次生成密码/卡片/指纹时都会产生）")
+    private String lockUserId;
+
+    @ApiModelProperty(value = "锁设备UID")
+    private String luid;
+
+    @ApiModelProperty(value = "开锁的方式（1.密码，2.卡片，3.指纹，4:身份证）")
+    private String lockStatus;
+
+    @ApiModelProperty(value = "开锁密码")
+    private String passWord;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

iHotel_student_houtai/src/main/java/com/template/auto/service/impl/UnlockingEmployeeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.template.auto.service.impl;
+
+import com.template.auto.model.UnlockingEmployee;
+import com.template.auto.mapper.UnlockingEmployeeMapper;
+import com.template.auto.services.UnlockingEmployeeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 员工添加钥匙 服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-19
+ */
+@Service
+public class UnlockingEmployeeServiceImpl extends ServiceImpl<UnlockingEmployeeMapper, UnlockingEmployee> implements UnlockingEmployeeService {
+
+}

iHotel_student_houtai/src/main/java/com/template/auto/services/UnlockingEmployeeService.java

@@ -0,0 +1,16 @@
+package com.template.auto.services;
+
+import com.template.auto.model.UnlockingEmployee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 员工添加钥匙 服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-19
+ */
+public interface UnlockingEmployeeService extends IService<UnlockingEmployee> {
+
+}

src/main/java/com/template/common/utils/RestTemplateconfig.java

@@ -0,0 +1,19 @@
+package com.template.common.utils;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+@ConditionalOnClass(RestTemplate.class)
+public class RestTemplateconfig {
+
+//    @Bean
+//    public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
+//        return restTemplateBuilder
+////配置 readTimeout
+//                .setReadTimeout(Duration.ofSeconds(5))
+////配置 连接超时
+//                .setConnectTimeout(Duration.ofSeconds(2)).build();
+//    }
+}

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -927,11 +927,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-                msg="开电失败";
-            }
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+////                return CommonResult.fail("开电失败");
+//                msg="开电失败";
+//            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1225,12 +1225,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+         //   Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg="";
-            if (!aBoolean) {
+           // if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-                msg="开电失败";
-            }
+          //      msg="开电失败";
+         //   }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -1586,12 +1586,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg="";
-        if (!aBoolean) {
+  //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-            msg="开电失败";
-        }
+      //      msg="开电失败";
+     //   }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1659,9 +1659,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 //      判断该用户是否拥有权限
         String houseTypeManagement = permissionSetting.getHouseStatusManagement();
-        if (!"0".equals(houseTypeManagement) && !"9".equals(houseTypeManagement)) {
-            return CommonResult.fail("此账号暂无该权限");
-        }
+//        if (!"0".equals(houseTypeManagement) && !"9".equals(houseTypeManagement)) {
+//            return CommonResult.fail("此账号暂无该权限");
+//        }
         String houseNumberId = dirtyRoomDto.getHouseNumberId();
 
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -1672,12 +1672,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+    //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg="";
-        if (!aBoolean) {
+      //  if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-            msg="开电失败";
-        }
+      //      msg="开电失败";
+     //   }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1715,12 +1715,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+       // Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg="";
-        if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-            msg="关电失败";
-        }
+//        if (!aBoolean) {
+////            return CommonResult.fail("关电失败");
+//            msg="关电失败";
+//        }
 
         houseNumberService.updateById(houseNumber);
         if (msg.equals("")) {
@@ -1753,11 +1753,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     return CommonResult.fail("房间异常");
                 }
 //                开电
-                Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-                if (!aBoolean) {
+       //         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+          //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-                    msg="开电失败";
-                }
+             //       msg="开电失败";
+             //   }
                 //        开电
                 houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
@@ -1805,12 +1805,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
                 houseNumber.setElectricType("2");
 //         关电
-                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-
-                if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-                    msg="关电失败";
-                }
+//                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//
+//                if (!aBoolean) {
+////            return CommonResult.fail("关电失败");
+//                    msg="关电失败";
+//                }
 
                 boolean update = houseNumberService.updateById(houseNumber);
                 if (!update) {
@@ -2165,12 +2165,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg="";
-        if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-            msg="关电失败";
-        }
+//        if (!aBoolean) {
+////            return CommonResult.fail("关电失败");
+//            msg="关电失败";
+//        }
         houseNumberService.updateById(houseNumber);
 
         if (msg.equals("")) {
@@ -2291,12 +2291,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //        关电
-            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-
-            if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-                msg="关电失败";
-            }
+//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//
+//            if (!aBoolean) {
+////            return CommonResult.fail("关电失败");
+//                msg="关电失败";
+//            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2317,12 +2317,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 
-            if (!aBoolean) {
+      //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-                msg="开电失败";
-            }
+       //         msg="开电失败";
+         //   }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }

src/main/java/com/template/controller/HouseOrderController.java

@@ -563,12 +563,12 @@ public class HouseOrderController implements HouseOrderAPI {
 
             HouseNumber number = houseNumberService.getById(houseLock.getHouseNumberId());
 //                开电
-                Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+               // Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
                 String msg="";
-                if (!aBoolean) {
-//                    return CommonResult.fail("开电失败");
-                    msg="开电失败";
-                }
+//                if (!aBoolean) {
+////                    return CommonResult.fail("开电失败");
+//                    msg="开电失败";
+//                }
 //                设置开电状态
             number.setElectricType("1");
 //                房间号设置成脏房需要退房后设置
@@ -898,12 +898,12 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg="";
-            if (!aBoolean) {
+        //    if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-                msg="开电失败";
-            }
+       //         msg="开电失败";
+          //  }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1330,12 +1330,12 @@ public class HouseOrderController implements HouseOrderAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+       //     Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg="";
-            if (!aBoolean) {
+        //    if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-                msg="开电失败";
-            }
+        //        msg="开电失败";
+          //  }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 

src/main/java/com/template/services/impl/ElectricEquipmentServiceImpl.java

@@ -25,6 +25,7 @@ import java.util.ArrayList;
 @Service
 public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentMapper, ElectricEquipment> implements ElectricEquipmentService {
 
+
     /**
      * 获取所有房间的电表设备
      */