2018/11/7

adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author David
@@ -41,9 +42,20 @@ public class DeviceController extends BaseController<Device> {
             deviceVO.setId(UUID.randomUUID());
             deviceVO.setUserId(user.getId());
             deviceVO.setMacAddress(deviceService.getMacByPhone(deviceVO.getPhoneNumber()));
-            deviceService.insertSelective(deviceVO);
-            return GenResponse.success();
+            Device device = new Device();
+            device.setUserId(user.getId());
+            device.setCode(deviceVO.getCode());
+            device.setType(deviceVO.getType());
+            device.setName(deviceVO.getName());
+            List<Map<String,Object>> list = deviceService.checkDevice(device);
+            System.out.println("66666666666666");
+            if(list.isEmpty()){
+                deviceService.insertSelective(deviceVO);
+                return GenResponse.success();
+            }
+            return GenResponse.fail("设备已存在");
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             return GenResponse.fail("保存失败");
         }
     }

adc-da-main/src/main/java/com/adc/da/znks/controller/GatewayController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author David
  */
@@ -42,11 +44,16 @@ public class GatewayController extends BaseController<Gateway> {
                     gateway.setId(UUID.randomUUID());
                     gateway.setUserId(user.getId());
                     gateway.setMacAddress(gateway.getMacAddress().toUpperCase());
-                    int count = gatewayService.insertSelective(gateway);
-                    if(count > 0) {
-                        return GenResponse.success();
-                    } else {
-                        return GenResponse.fail("保存失败");
+                    List<Gateway> list = gatewayService.checkGateWay(user.getId(),gateway.getMacAddress().toUpperCase());
+                    if(list.isEmpty()){
+                        int count = gatewayService.insertSelective(gateway);
+                        if(count > 0) {
+                            return GenResponse.success();
+                        } else {
+                            return GenResponse.fail("保存失败");
+                        }
+                    }else{
+                        return GenResponse.fail("数据已存在");
                     }
                 }else{
                     return GenResponse.fail("网关链路关闭，保存失败");

adc-da-main/src/main/java/com/adc/da/znks/controller/InstructionsController.java

@@ -314,6 +314,27 @@ public class InstructionsController {
         }
     }
 
+    /**
+     * 验证网关是否在线
+     * @param phoneNumber
+     * @return
+     */
+    @GetMapping("/validateGateWay")
+    public ResponseEntity<Boolean> validateGateWay(String phoneNumber) {
+
+        String mac = getMacByPhone(phoneNumber);
+        if(mac==null){
+            return GenResponse.fail("网关mac获取失败");
+        }
+        if(SystemValue.channelMap.get(mac)!=null){
+            Channel ch = ((Channel)SystemValue.channelMap.get(mac));
+            if(ch.isActive()){
+                return GenResponse.success();
+            }
+        }
+        return GenResponse.fail("网关未连接");
+    }
+
 
 
     public String getMacByPhone(String phone){

adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java

@@ -41,11 +41,14 @@ public class UserController extends BaseController<User> {
     @ApiOperation(value = "|User|登录或者注册用户")
     @PostMapping(value = {"/loginOrRegisterUser"})
     public ResponseEntity<Boolean> loginOrRegisterUser(String phoneNumber, String password) {
-        boolean flag = userService.loginOrRegister(phoneNumber, password);
-        if (flag) {
-            return GenResponse.success(String.valueOf(HttpStatus.OK.value()), "登录或者注册用户成功", flag);
+        int i = userService.loginOrRegister(phoneNumber, password);
+        if (i<0) {
+            return GenResponse.success(String.valueOf(HttpStatus.OK), "用户不存在", false);
         } else {
-            return GenResponse.fail("登录或者注册用户失败");
+            if(i>0){
+                return GenResponse.success(String.valueOf(HttpStatus.OK), "登陆成功", true);
+            }
+            return GenResponse.fail("登录失败");
         }
     }
 
@@ -105,4 +108,30 @@ public class UserController extends BaseController<User> {
         }
     }
 
+    @ApiOperation(value = "更新家庭名称")
+    @PostMapping("/updateHomeName")
+    public ResponseEntity updateHomeName(String phoneNumber, String homeName) {
+        User user = new User();
+        user.setTemphone(phoneNumber);
+        user.setHomeName(homeName);
+        if(userService.updateHomeName(user)){
+            return GenResponse.success();
+        }
+        return GenResponse.fail("更新失败");
+    }
+
+    @ApiOperation(value = "获取家庭名称")
+    @PostMapping("/getHomeName")
+    public ResponseEntity<String> getHomeName(String phoneNumber) {
+        String name = userService.selectHomeNameByPhone(phoneNumber);
+        return GenResponse.success("200","", name);
+    }
+
+    @ApiOperation(value = "|User|增加用户")
+    @PostMapping(value = {"/register"})
+    public ResponseEntity<Boolean> register(String phoneNumber) {
+        boolean flag = userService.addUser(phoneNumber);
+        return GenResponse.success(String.valueOf(HttpStatus.OK.value()), "", flag);
+    }
+
 }

adc-da-main/src/main/java/com/adc/da/znks/dao/DeviceDao.java

@@ -37,4 +37,6 @@ public interface DeviceDao extends BaseDao<Device> {
             "                AND t.temphone = #{phone}")
     List<Map<String,Object>> getMacByPhone(@Param("phone") String phone);
 
+    List<Map<String,Object>> checkDevice(@Param("name") String name,@Param("code") int code,@Param("type") int type,@Param("userId") String userId);
+
 }

adc-da-main/src/main/java/com/adc/da/znks/dao/GatewayDao.java

@@ -30,4 +30,6 @@ public interface GatewayDao extends BaseDao<Gateway> {
     @Update("update tb_gateway set mac_address = #{macAddress} where user_id = #{userId}")
     int updateMacByUser(@Param("userId") String userId,@Param("macAddress") String macAddress);
 
+    List<Gateway> checkGateWay(@Param("userId") String userId,@Param("macAddress") String macAddress);
+
 }

adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java

@@ -21,7 +21,7 @@ import java.util.Map;
 @Mapper
 public interface UserDao extends BaseDao<User> {
 
-    @Select("SELECT * FROM tb_user WHERE temphone = #{phoneNumber}")
+    @Select("SELECT * FROM tb_user WHERE temphone = #{phoneNumber} limit 1")
     User getUserByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 
     List<Map<String,Object>> queryMacByPhone(@Param("phone") String phone);
@@ -42,4 +42,8 @@ public interface UserDao extends BaseDao<User> {
     List<UserVO> listUserVOs(@Param("userSearch") UserSearch userSearch,
                             @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
+    int updateHomeName(User user);
+
+    List<User> selectHomeNameByPhone(@Param("temphone") String temphone);
+
 }

adc-da-main/src/main/java/com/adc/da/znks/entity/User.java

@@ -20,6 +20,8 @@ public class User extends BaseEntity {
 
     private String clientId;
 
+    private String homeName;
+
     public User() {
     }
 
@@ -83,6 +85,14 @@ public class User extends BaseEntity {
         this.clientId = clientId;
     }
 
+    public String getHomeName() {
+        return homeName;
+    }
+
+    public void setHomeName(String homeName) {
+        this.homeName = homeName;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("{");

adc-da-main/src/main/java/com/adc/da/znks/service/DeviceService.java

@@ -45,4 +45,8 @@ public class DeviceService extends BaseService<Device, String> {
     public String getMacByPhone(String phone){
         return dao.getMacByPhone(phone)!=null?dao.getMacByPhone(phone).get(0).get("mac_address").toString():"";
     }
+
+    public List<Map<String,Object>> checkDevice(Device device){
+        return dao.checkDevice(device.getName(),device.getCode(),device.getType(),device.getUserId());
+    }
 }

adc-da-main/src/main/java/com/adc/da/znks/service/GatewayService.java

@@ -79,4 +79,8 @@ public class GatewayService extends BaseService<Gateway, String> {
         }
         return false;
     }
+
+    public List<Gateway> checkGateWay(String userId,String macAddress){
+        return dao.checkGateWay(userId,macAddress);
+    }
 }

adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java

@@ -53,11 +53,12 @@ public class UserService extends BaseService<User, String> {
         Boolean flag = false;
         User user = dao.getUserByPhoneNumber(phoneNumber);
         if(user != null) {
-            if(user.getPassword()!=null && !"".equals(user.getPassword())){
+            /*if(user.getPassword()!=null && !"".equals(user.getPassword())){
                 flag = true;
             }else{
                 flag = false;
-            }
+            }*/
+            flag = true;
         }
         return flag;
     }
@@ -94,12 +95,15 @@ public class UserService extends BaseService<User, String> {
     /**
      * user login or register
      **/
-    public boolean loginOrRegister(String temphone, String plainPassword) {
+    public int loginOrRegister(String temphone, String plainPassword) {
+        if(temphone == null || plainPassword == null || temphone.equals("") || plainPassword.equals("")){
+            return -1;
+        }
         UserPage userPage = new UserPage();
         userPage.setTemphone(temphone);
         List<User> users = dao.queryByList(userPage);
         if (CollectionUtils.isEmpty(users)) {
-            List<String> encryptList = encryptList(plainPassword);
+            /*List<String> encryptList = encryptList(plainPassword);
             Asserts.notNull(encryptList, "encrypt list must not be null.");
             String id = UUID.randomUUID();
             User insertUser = new User(id, temphone, "", "");
@@ -109,17 +113,17 @@ public class UserService extends BaseService<User, String> {
                 return true;
             } else {
                 return false;
-            }
-        } else {
-            /*User user = users.get(0);
-            String decryptPassword = SecurityUtils.decrypt(user.getEncryptkey(), user.getPassword());
-            Asserts.notNull(plainPassword, "plainPassword must not be null.");
-            if (plainPassword.equals(decryptPassword)) {
-                return true;
-            } else {
-                return false;
             }*/
-            return true;
+            return -1;
+        } else {
+            if(users.size()>1){
+                return 0;
+            }
+            String mPassword = SecurityUtils.decrypt(users.get(0).getEncryptkey(),users.get(0).getPassword());
+            if(plainPassword.equals(mPassword)){
+                return 1;
+            }
+            return 0;
         }
     }
 
@@ -159,4 +163,34 @@ public class UserService extends BaseService<User, String> {
         List<UserVO> userVOS=dao.listUserVOs(userSearch,pageNUm,pageSize);
         return userVOS;
     }
+
+    public boolean updateHomeName(User user){
+        if(dao.updateHomeName(user)>0){
+            return true;
+        }
+        return false;
+    }
+
+    public String selectHomeNameByPhone(String temphone){
+        List<User> list = dao.selectHomeNameByPhone(temphone);
+        if(!list.isEmpty()){
+            return list.get(0).getHomeName();
+        }
+        return null;
+    }
+
+    public boolean addUser(String temphone){
+        User user = dao.getUserByPhoneNumber(temphone);
+        if(user != null){
+            return false;
+        }
+        String id = UUID.randomUUID();
+        User insertUser = new User(id, temphone, "", "");
+        logger.info("insertUser: {}", insertUser);
+        int result = dao.insertSelective(insertUser);
+        if(result>0){
+            return true;
+        }
+        return false;
+    }
 }

adc-da-main/src/main/java/com/adc/da/znks/util/netty/ServerHandler.java

@@ -118,8 +118,8 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
 						}
 					}
 					if("80".equals(instruct)){ // 远程开锁触发请求，发送透传
-						AppPushUtils.pushTc(title,message,client);
-						AppPushUtils.push(title,message,client);
+						/*AppPushUtils.pushTc(title,message,client);
+						AppPushUtils.push(title,message,client);*/
 					}else{
 						AppPushUtils.push(title,message,client);
 					}

adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml

@@ -60,4 +60,8 @@
         delete from tb_device where id = #{id}
     </delete>
 
+    <select id="checkDevice" parameterType="com.adc.da.znks.entity.Device" resultType="java.util.Map">
+        select * from tb_device where name = #{name} and type = #{type} and user_id = #{userId} and code = #{code}
+    </select>
+
 </mapper>

adc-da-main/src/main/resources/mybatis/mapper/znks/GatewayMapper.xml

@@ -48,4 +48,8 @@
         select * from tb_gateway where ip = #{ip}
     </select>
 
+    <select id="checkGateWay" parameterType = "java.util.Map" resultType="com.adc.da.znks.entity.Gateway">
+        select * from tb_gateway where user_id = #{userId} and mac_address = #{macAddress}
+    </select>
+
 </mapper>

adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml

@@ -168,6 +168,7 @@ SELECT SEQ_tb_position.NEXTVAL FROM DUAL
                 u.temphone LIKE #{telphoneLike}
             </if>
         </where>
+        order by p.record_time desc
     </select>
 
 </mapper>

adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml

@@ -174,4 +174,12 @@
         GROUP BY u.`id`
     </select>
 
+    <update id="updateHomeName" parameterType="com.adc.da.znks.entity.User">
+        update tb_user set home_name = #{homeName} where temphone = #{temphone}
+    </update>
+
+    <select id="selectHomeNameByPhone" parameterType="java.util.Map" resultType="com.adc.da.znks.entity.User">
+        select temphone,home_name homeName from tb_user where temphone = #{temphone}
+    </select>
+
 </mapper>