7.20后端修改

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -172,7 +172,7 @@ public class MysqlServiceImpl implements MysqlService {
                             if(ObjectUtils.isEmpty(user)){
                                 logger.info("用户不存在");
                                 user = new User();
-                                String country = null;
+                                String country = "未知";
                                 BaseDES des = new BaseDES();
                                 String desjwcode= des.encrypt(String.valueOf(jwcode));
                                 System.out.println("desjwcode:"+desjwcode);
@@ -220,7 +220,7 @@ public class MysqlServiceImpl implements MysqlService {
                                 } catch (Exception e) {
                                     System.out.println("Error: " + e.getMessage());
                                     // 设置默认的 country 值
-                                    country = "Unknown";
+                                    country = "未知";
                                 }
 
                                 user.setJwcode(jwcode);

src/main/java/com/example/demo/Util/StringToListTypeHandler.java

@@ -0,0 +1,37 @@
+package com.example.demo.Util;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+public class StringToListTypeHandler extends BaseTypeHandler<List<String>> {
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, String.join(",", parameter)); // 将 List 转换为逗号分隔的字符串
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        String value = rs.getString(columnName);
+        return value == null ? null : Arrays.asList(value.split(",")); // 将字符串转换为 List
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        String value = rs.getString(columnIndex);
+        return value == null ? null : Arrays.asList(value.split(","));
+    }
+
+    @Override
+    public List<String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        String value = cs.getString(columnIndex);
+        return value == null ? null : Arrays.asList(value.split(","));
+    }
+}

src/main/java/com/example/demo/controller/WorkbenchController.java

@@ -1,8 +1,6 @@
 package com.example.demo.controller;
 
 import com.example.demo.domain.entity.Admin;
-import com.example.demo.domain.entity.Statistics;
-import com.example.demo.domain.vo.TestRequest;
 import com.example.demo.domain.vo.WorkbenchCard;
 import com.example.demo.mapper.StatisticsMapper;
 import com.example.demo.service.GeneralService;
@@ -13,9 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;

src/main/java/com/example/demo/domain/entity/Admin.java

@@ -23,6 +23,7 @@ public class Admin implements UserDetails, Serializable {
     private String account; // 账号
     private String password; // 密码
     private String machineId; // 机器码，限两个
+    private List<String > machineIds;//数组机器码
     private Byte adminStatus; // 状态（启用/不启用）
     private List<String> market; // 地区列表
     private String markets; // 地区
@@ -42,7 +43,7 @@ public class Admin implements UserDetails, Serializable {
     @JsonIgnore
     public Collection<? extends GrantedAuthority> getAuthorities() {
         Set<GrantedAuthority> authorities = new HashSet<>();
-        Optional.ofNullable(postiton)
+        Optional.ofNullable(roleId)
                 .map(Integer::valueOf)
                 .ifPresent(permValue -> {
                     switch (permValue) {

src/main/java/com/example/demo/domain/vo/Permission.java

@@ -3,6 +3,8 @@ package com.example.demo.domain.vo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @program: GOLD
  * @ClassName Permission
@@ -16,6 +18,8 @@ import lombok.NoArgsConstructor;
 public class Permission {
     private String token;
     private String id;
+    private String machineId;
+    private List<String> machineIds;
     private String name; //姓名
     private String account; //账号
     private String market;  //地区

src/main/java/com/example/demo/service/PermissionService.java

@@ -30,4 +30,5 @@ public interface PermissionService {
     Integer upadatePermission(Admin admin) throws Exception;
     //更新管理员信息
     Result updateAdmin(AdminVo adminVo)throws Exception;
+
 }

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -54,6 +55,13 @@ public class PermissionServiceImpl implements PermissionService {
     public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) {
         PageHelper.startPage(pageNum, pageSize);
         List<Permission> list = permissionMapper.getPermission(permission);
+        for (Permission item : list) {
+            String machineIdsStr = item.getMachineId(); // 假设原始字段是 String 类型
+            if (machineIdsStr != null && !machineIdsStr.isEmpty()) {
+                List<String> machineIds = Arrays.asList(machineIdsStr.split(","));
+                item.setMachineIds(machineIds); // 设置为 List<String>
+            }
+        }
         return new PageInfo<>(list);
     }
 
@@ -160,6 +168,7 @@ public class PermissionServiceImpl implements PermissionService {
             admin.setAdminName(adminVo.getAdminName());
             admin.setMarket(adminVo.getMarket());
             admin.setPostiton(adminVo.getPostiton());
+            admin.setRoleId(adminVo.getRoleId());
             // 将地区列表转换为逗号分隔的字符串
             String markets = String.join(",", admin.getMarket());
             admin.setMarket(Collections.singletonList(markets));

src/main/resources/application-dev.yml

@@ -35,9 +35,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 18.143.76.3
-      port: 10703
-      password: Ngc0FYUTA6h3wC5J
+      host: localhost
+      port: 6379
+      password: 123456
 
       lettuce:
         pool:

src/main/resources/application.yml

@@ -80,6 +80,7 @@ spring:
           max-idle: 5
 
 mybatis:
+  type-handlers-package: com.example.demo.Util
   configuration:
     mysql1:
       map-underscore-to-camel-case: true

src/main/resources/mapper/PermissionMapper.xml

@@ -43,6 +43,9 @@
             <if test="remark!=null">
                 remark= #{remark},
             </if>
+            <if test="roleId!=null">
+                role_id= #{roleId},
+            </if>
             market= #{market[0]}
         </set>
         where account= #{account}
@@ -67,13 +70,10 @@
         from admin
     </select>
     <select id="getPermission" resultType="com.example.demo.domain.vo.Permission">
-        select admin.id as id,admin.admin_name as
-        name,admin.account,admin.market,admin.postiton,admin.remark,admin.admin_status as adminStatus,role.role_name as
-        roleName,role.id as roleId
+        select admin.id as id,admin.machine_id,admin.admin_name as
+        name,admin.account,admin.market,admin.postiton,admin.remark,admin.admin_status as adminStatus,admin.role_id,role.role_name
         from admin
-
-        left join role on admin.role_id=role.id
-
+        LEFT JOIN role on admin.role_id=role.id
         <where>
             <if test="account!=null and account.length>0">
                 and admin.account=#{account}