优化一些功能

src/main/java/com/zy/bms/common/vo/DeviceVo.java → src/main/java/com/zy/bms/common/vo/DeviceRelationVo.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * Create on 2020/8/1
  */
 @Data
-public class DeviceVo {
+public class DeviceRelationVo {
     private String num;//设备随机码
     private String name;//设备名称
     private String deviceId;//设备ID

src/main/java/com/zy/bms/config/InterceptorConfig.java

@@ -2,6 +2,7 @@ package com.zy.bms.config;
 
 import com.zy.bms.common.interceptor.AuthInterceptor;
 import com.zy.bms.common.interceptor.VerifyInterceptor;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -15,7 +16,7 @@ import java.util.List;
  * @author chenyi
  * Create on 2019/10/10
  */
-//@Configuration
+@Configuration
 public class InterceptorConfig implements WebMvcConfigurer {
     /**
      * 身份验证拦截器

src/main/java/com/zy/bms/controller/IdiomsController.java

@@ -1,6 +1,5 @@
 package com.zy.bms.controller;
 
-import com.zy.bms.common.exception.ApiRuntimeException;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.model.UserIdioms;
 import com.zy.bms.service.IdiomsService;
@@ -30,7 +29,7 @@ public class IdiomsController {
      * @param userId 用户ID
      */
     @GetMapping("getList.do")
-    public ServerResponse getUserIdioms(String userId) {
+    public ServerResponse getList(String userId) {
         return ServerResponse.createBySuccess(userIdiomsService.getListByUserId(userId));
     }
 
@@ -39,20 +38,17 @@ public class IdiomsController {
      */
     @PostMapping("save.do")
     public ServerResponse save(UserIdioms entity) {
-        if (!userIdiomsService.save(entity)) {
-            throw new ApiRuntimeException("添加常用语失败");
+        if (userIdiomsService.countByUserId(entity.getUserId()) > 5) {
+            return ServerResponse.createByWarningMsg("最多添加五条常用语");
         }
-        return ServerResponse.createBySuccess();
+        return ServerResponse.createBySuccess(userIdiomsService.save(entity));
     }
 
     /**
      * 通过ID删除常用语
      */
     @PostMapping("delById.do")
-    public ServerResponse delById(Integer id) {
-        if (!userIdiomsService.removeById(id)) {
-            throw new ApiRuntimeException("删除常用语失败");
-        }
-        return ServerResponse.createBySuccess();
+    public ServerResponse delById(Integer id, String userId) {
+        return ServerResponse.createBySuccess(userIdiomsService.delById(id, userId));
     }
 }

src/main/java/com/zy/bms/controller/RelationController.java

@@ -36,7 +36,7 @@ public class RelationController {
     public ServerResponse bind(UserDeviceRelationIO io) {
         if (deviceService.getByNum(io.getDeviceNum()) == null)
             return ServerResponse.createByWarningMsg("无效设备码!");
-        if (relationService.getByDeviceNum(io.getDeviceNum()) != null)
+        if (relationService.isBind(io.getDeviceNum()))
             return ServerResponse.createByWarningMsg("该设备已经有用户绑定!");
         relationService.saveEntity(io);
         return ServerResponse.createBySuccess();
@@ -46,8 +46,8 @@ public class RelationController {
      * 解除绑定关系
      */
     @PostMapping("unbind.do")
-    public ServerResponse unbind(String deviceNum) {
-        relationService.delByDeviceNum(deviceNum);
+    public ServerResponse unbind(String deviceNum, String userId) {
+        relationService.unbind(deviceNum, userId);
         return ServerResponse.createBySuccess();
     }
 

src/main/java/com/zy/bms/mapper/UserDeviceRelationMapper.java

@@ -2,7 +2,7 @@ package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zy.bms.model.UserDeviceRelation;
-import com.zy.bms.common.vo.DeviceVo;
+import com.zy.bms.common.vo.DeviceRelationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -24,5 +24,5 @@ public interface UserDeviceRelationMapper extends BaseMapper<UserDeviceRelation>
      *
      * @param userId 用户ID
      */
-    List<DeviceVo> getListByUserId(@Param("userId") String userId);
+    List<DeviceRelationVo> getListByUserId(@Param("userId") String userId);
 }

src/main/java/com/zy/bms/service/IdiomsService.java

@@ -23,7 +23,33 @@ public class IdiomsService extends ServiceImpl<IdiomsMapper, UserIdioms> {
      * @param userId 用户ID
      */
     public List<UserIdioms> getListByUserId(String userId) {
-        return baseMapper.selectList(new QueryWrapper<UserIdioms>()
-                .eq("userId", userId).orderByDesc("createTime"));
+        QueryWrapper<UserIdioms> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", userId);
+        queryWrapper.orderByDesc("createTime");
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 查询用户常用语数量
+     *
+     * @param userId 用户ID
+     */
+    public int countByUserId(String userId) {
+        QueryWrapper<UserIdioms> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", userId);
+        return baseMapper.selectCount(queryWrapper);
+    }
+
+    /**
+     * 删除常用语
+     *
+     * @param id     常用语主键ID
+     * @param userId 用户ID
+     */
+    public int delById(Integer id, String userId) {
+        QueryWrapper<UserIdioms> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id);
+        queryWrapper.eq("userId", userId);
+        return baseMapper.delete(queryWrapper);
     }
 }

src/main/java/com/zy/bms/service/RelationService.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zy.bms.common.io.wechat.UserDeviceRelationIO;
 import com.zy.bms.mapper.UserDeviceRelationMapper;
 import com.zy.bms.model.UserDeviceRelation;
-import com.zy.bms.common.vo.DeviceVo;
+import com.zy.bms.common.vo.DeviceRelationVo;
 import com.zy.bms.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 
@@ -45,8 +45,11 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      *
      * @param deviceNum 设备号
      */
-    public void delByDeviceNum(String deviceNum) {
-        baseMapper.delete(new QueryWrapper<UserDeviceRelation>().eq("deviceNum", deviceNum));
+    public void unbind(String deviceNum, String userId) {
+        QueryWrapper<UserDeviceRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("deviceNum", deviceNum);
+        queryWrapper.eq("userId", userId);
+        baseMapper.delete(queryWrapper);
     }
 
     /**
@@ -54,7 +57,7 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      *
      * @param userId 用户ID
      */
-    public List<DeviceVo> getListByUserId(String userId) {
+    public List<DeviceRelationVo> getListByUserId(String userId) {
         return baseMapper.getListByUserId(userId);
     }
 
@@ -63,7 +66,9 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      *
      * @param deviceNum 设备号
      */
-    public UserDeviceRelation getByDeviceNum(String deviceNum) {
-        return baseMapper.selectOne(new QueryWrapper<UserDeviceRelation>().eq("deviceNum", deviceNum));
+    public boolean isBind(String deviceNum) {
+        QueryWrapper<UserDeviceRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("deviceNum", deviceNum);
+        return baseMapper.selectCount(queryWrapper) > 0;
     }
 }

src/main/java/com/zy/bms/utils/MD5Util.java

@@ -22,9 +22,9 @@ public class MD5Util {
             StringBuilder stringBuilder = new StringBuilder();
             MessageDigest messageDigest = MessageDigest.getInstance("MD5");
             messageDigest.update(plainText.getBytes());
-            byte[] b = messageDigest.digest();
+            byte[] bytes = messageDigest.digest();
             int i;
-            for (byte value : b) {
+            for (byte value : bytes) {
                 i = value;
                 if (i < 0) i += 256;
                 if (i < 16) stringBuilder.append("0");

src/main/resources/mapper/DeviceLocationMapping.xml

@@ -9,12 +9,12 @@
             deviceId,
             lonGcj,
             latGcj,
-            dataCreateTime,
-            mode
+            uploadTime,
+            `mode`
         FROM
             zy_location
         WHERE
-            deviceId = #{deviceId} AND dataCreateTime >= #{startTime} AND dataCreateTime <= #{endTime}
-        ORDER BY dataCreateTime DESC
+            deviceId = #{deviceId} AND uploadTime >= #{startTime} AND uploadTime <= #{endTime}
+        ORDER BY uploadTime DESC
     </select>
 </mapper>

src/main/resources/mapper/UserDeviceRelationMapping.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.UserDeviceRelationMapper">
 
-    <select id="getListByUserId" resultType="com.zy.bms.common.vo.DeviceVo">
+    <select id="getListByUserId" resultType="com.zy.bms.common.vo.DeviceRelationVo">
         SELECT t1.isDefault,
                t2.num,
                t2.name,