增加角色,项目,项目组管理

src/main/java/com/zy/bms/controller/pc/AdminController.java

@@ -40,7 +40,7 @@ public class AdminController extends BaseController {
         Admin admin = adminService.getByUsernameOrPhone(username);
         if (admin == null) return ServerResponse.createByWarning("用户不存在");
         //MD5密码
-        password = MD5Util.MD5Encode(password, admin.getSalt());
+        password = MD5Util.MD5Encode(password);
         if (!admin.getPassword().equals(password)) return ServerResponse.createByWarning("密码错误");
         // 返回 token 和 昵称
         Map<String, String> result = new HashMap<>();

src/main/java/com/zy/bms/model/Admin.java

@@ -39,11 +39,6 @@ public class Admin {
      */
     private String password;
 
-    /**
-     * 密码盐值
-     */
-    private String salt;
-
     /**
      * 角色ID
      */

src/main/java/com/zy/bms/model/Group.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  * @since 2021-05-19
  */
 @Data
-@TableName("group")
+@TableName("item_group")
 public class Group implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -9,7 +9,6 @@ import com.zy.bms.common.io.pc.AdminIO;
 import com.zy.bms.common.vo.AdminListVo;
 import com.zy.bms.mapper.AdminMapper;
 import com.zy.bms.model.Admin;
-import com.zy.bms.utils.CodeGenerator;
 import com.zy.bms.utils.MD5Util;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -46,8 +45,7 @@ public class AdminService extends ServiceImpl<AdminMapper, Admin> {
      * 添加用户
      */
     public void saveAdmin(Admin admin) {
-        admin.setSalt(CodeGenerator.shortUuid());
-        admin.setPassword(MD5Util.MD5Encode(admin.getPassword(), admin.getSalt()));
+        admin.setPassword(MD5Util.MD5Encode(admin.getPassword()));
         admin.setStatus(1);
         save(admin);
     }

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

@@ -1,6 +1,5 @@
 package com.zy.bms.utils;
 
-
 import java.security.MessageDigest;
 
 /**
@@ -10,33 +9,6 @@ import java.security.MessageDigest;
  * Create on 2020/10/17
  */
 public class MD5Util {
-
-    /**
-     * MD5 字符串加密
-     *
-     * @param plainText 加密字符串
-     * @param salt      盐值
-     */
-    public static String MD5Encode(String plainText, String salt) {
-        try {
-            String psd = plainText + salt;
-            StringBuilder stringBuilder = new StringBuilder();
-            MessageDigest messageDigest = MessageDigest.getInstance("MD5");
-            messageDigest.update(psd.getBytes());
-            byte[] bytes = messageDigest.digest();
-            int i;
-            for (byte value : bytes) {
-                i = value;
-                if (i < 0) i += 256;
-                if (i < 16) stringBuilder.append("0");
-                stringBuilder.append(Integer.toHexString(i));
-            }
-            return stringBuilder.toString();
-        } catch (Exception e) {
-            return "MD5";
-        }
-    }
-
     /**
      * MD5 字符串加密
      *

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8080
 spring:
   redis:
     host: 59.110.141.39

src/main/resources/mapper/DeviceMapping.xml

@@ -9,7 +9,7 @@
             t1.createTime,
             t1.status,
             t1.`name`,
-            t3.`name`           AS group,
+            t3.`name`           AS `group`,
             t4.`name`           AS item,
             t2.deviceId,
             t2.`mode`,
@@ -25,10 +25,9 @@
             t2.uploadTime
         FROM
             zy_device t1
-        LEFT JOIN
-            latest_location t2 ON t1.deviceId = t2.deviceId
-            `group` t3 ON t1.groupId = t3.id
-            item t4 ON t3.itemId = t4.id
+        LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
+        LEFT JOIN `item_group` t3 ON t1.groupId = t3.id
+        LEFT JOIN item t4 ON t3.itemId = t4.id
         <where>
             <if test="io.num != null and io.num != ''">
                 AND (t1.num LIKE CONCAT("%",#{io.num},"%") OR t1.clientId LIKE CONCAT("%",#{io.num},"%"))