fix:用户修改，api修改

pom.xml

@@ -27,7 +27,7 @@
         <url/>
     </scm>
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencies>
         <dependency>

src/main/java/com/lqkj/cmlcp/module/api/controller/ApiInfoController.java

@@ -1,5 +1,6 @@
 package com.lqkj.cmlcp.module.api.controller;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.lqkj.cmlcp.message.Result;
 import com.lqkj.cmlcp.module.api.domain.ApiInfo;
 import com.lqkj.cmlcp.module.api.service.ApiInfoService;
@@ -33,7 +34,7 @@ public class ApiInfoController {
     }
 
     @PostMapping("/delete")
-    public Result delete(@RequestBody List<Integer> ids) {
+    public Result delete(@RequestParam List<Integer> ids) {
         apiInfoService.delete(ids);
         return Result.ok();
     }
@@ -54,4 +55,58 @@ public class ApiInfoController {
         return Result.ok();
     }
 
+    @PostMapping ("/postTest")
+    public Result PostTest(@RequestBody ApiInfo apiInfo) {
+        String str = "[{'label': '全彩5456屏','value': 71},{'label': '双基色屏','value': 81},{'label': '简易屏','value': 57},{'label': '条形屏','value': 3}]";
+        ApiInfo apiInfo1 = new ApiInfo();
+        apiInfo1.setData(JSONArray.parse(str));
+        return Result.ok(apiInfo1);
+    }
+
+    @GetMapping("/getTest")
+    public Result GetTest(@RequestParam String name) {
+        String str = "[{'label': '全彩5456屏','value': 71},{'label': '双基色屏','value': 81},{'label': '简易屏','value': 57},{'label': '条形屏','value': 3}]";
+        ApiInfo apiInfo1 = new ApiInfo();
+        apiInfo1.setData(JSONArray.parse(str));
+        return Result.ok(apiInfo1);
+    }
+
+    @GetMapping("/getTest2")
+    public Result GetTest2() {
+        String str = "[\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"测试333\",\n" +
+                "\t\t\"value\": 61\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"齐\",\n" +
+                "\t\t\"value\": 5\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"楚\",\n" +
+                "\t\t\"value\": 7\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"赵\",\n" +
+                "\t\t\"value\": 76\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"燕\",\n" +
+                "\t\t\"value\": 10\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"韩\",\n" +
+                "\t\t\"value\": 9\n" +
+                "\t},\n" +
+                "\t{\n" +
+                "\t\t\"label\": \"魏\",\n" +
+                "\t\t\"value\": 22\n" +
+                "\t}\n" +
+                "]";
+        ApiInfo apiInfo1 = new ApiInfo();
+        apiInfo1.setData(JSONArray.parse(str));
+        return Result.ok(apiInfo1);
+    }
+
+
 }

src/main/java/com/lqkj/cmlcp/module/api/service/impl/ApiInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.lqkj.cmlcp.module.api.service.impl;
 
-import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -56,9 +55,6 @@ public class ApiInfoServiceImpl implements ApiInfoService {
     @Override
     public void importExcel(MultipartFile file) {
         try {
-            ImportParams params = new ImportParams();
-            params.setTitleRows(1); // 表示表格的标题行数
-            params.setHeadRows(1);  // 表示表头行数
             List<ApiInfo> apiInfos = EasyExcel.read(file.getInputStream()).head(ApiInfo.class).sheet().doReadSync();
             apiInfoRepository.saveAll(apiInfos);
         } catch (Exception e) {
@@ -66,6 +62,10 @@ public class ApiInfoServiceImpl implements ApiInfoService {
         }
     }
 
+    /**
+     * 封装数据库数据
+     * @param apiInfo
+     */
     private void encapsuLationDbData(ApiInfo apiInfo) {
         if (apiInfo.getData() != null) return;
         JSONObject params = apiInfo.getParams();

src/main/java/com/lqkj/cmlcp/module/authority/controller/UserInfoController.java

@@ -155,4 +155,17 @@ public class UserInfoController {
         return Result.ok(null, "更新用户信息");
     }
 
+    /**
+     * 检查是否能登录后台
+     */
+    @GetMapping("/check")
+    public Result<String> check(String userCode) {
+        if (userInfoService.check(userCode)){
+            return Result.ok("可以登录后台");
+        }else{
+            return Result.fail("暂无权限，请联系管理员");
+        }
+
+    }
+
 }

src/main/java/com/lqkj/cmlcp/module/authority/service/UserInfoService.java

@@ -75,4 +75,11 @@ public interface UserInfoService{
     void delete(List<Integer> userIds);
 
     void updateInfo(String userCode, String displayName, String headImgPath);
+
+    /**
+     * 检测用户是否可以登录后台
+     * @param userCode
+     * @return
+     */
+    boolean check(String userCode);
 }

src/main/java/com/lqkj/cmlcp/module/authority/service/impl/UserInfoServiceImpl.java

@@ -86,7 +86,7 @@ public class UserInfoServiceImpl implements UserInfoService{
                 return "账号已被冻结,请稍后重试";
             }
             userInfoRepository.save(userInfo);
-            return "账号、密码或授权码输入错误," + (4 - loginErrorCount) +"次错误后,账号将会冻结1小时";
+            return "账号、密码输入错误," + (4 - loginErrorCount) +"次错误后,账号将会冻结1小时";
         }
     }
 
@@ -184,12 +184,12 @@ public class UserInfoServiceImpl implements UserInfoService{
         }
 
         // 授权码判断，8位数字、大写字母、小写字母
-        String auCodeRegex = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8}$";
-        pattern = Pattern.compile(auCodeRegex);
-        matcher = pattern.matcher(userInfo.getAuthorizationCode());
-        if (!matcher.find()) {
-            return "授权码必须是8位数字、大写字母、小写字母！";
-        }
+//        String auCodeRegex = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8}$";
+//        pattern = Pattern.compile(auCodeRegex);
+//        matcher = pattern.matcher(userInfo.getAuthorizationCode());
+//        if (!matcher.find()) {
+//            return "授权码必须是8位数字、大写字母、小写字母！";
+//        }
 
         if (userInfo.getId() == null) {
             // 重复判断
@@ -224,7 +224,7 @@ public class UserInfoServiceImpl implements UserInfoService{
             }
             oldUser.setDisplayName(userInfo.getDisplayName());
             oldUser.setHasManage(userInfo.getHasManage());
-            oldUser.setAuthorizationCode(userInfo.getAuthorizationCode());
+//            oldUser.setAuthorizationCode(userInfo.getAuthorizationCode());
             oldUser.setUpdateTime(new Date());
             userInfoRepository.save(oldUser);
         }
@@ -249,6 +249,15 @@ public class UserInfoServiceImpl implements UserInfoService{
         userInfoRepository.save(userInfo);
     }
 
+    @Override
+    public boolean check(String userCode) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        if (userInfo == null) {
+            return false;
+        }
+        return userInfo.getHasManage();
+    }
+
     @PostConstruct
     @Transactional
     public void initSuperUser() {

src/main/java/com/lqkj/cmlcp/module/base/controller/ChatController.java

@@ -0,0 +1,111 @@
+package com.lqkj.cmlcp.module.base.controller;
+
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@RestController
+@RequestMapping("/chat")
+public class ChatController {
+
+    private static final ConcurrentHashMap<String, ResponseBodyEmitter> onlineUsers = new ConcurrentHashMap<>();
+    // 存储聊天消息（可替换为数据库）
+    private static final List<Map<String, String>> messageHistory = new CopyOnWriteArrayList<>();
+
+    /**
+     * 用户连接聊天通道
+     * @param userId 用户唯一标识
+     */
+    @GetMapping("/connect")
+    public ResponseBodyEmitter connect(@RequestParam String userId) {
+
+        ResponseBodyEmitter emitter = new ResponseBodyEmitter(-1L);
+        // 移除旧连接并添加新连接
+        onlineUsers.computeIfPresent(userId, (k, v) -> {
+            v.complete();
+            return emitter;
+        });
+        onlineUsers.putIfAbsent(userId, emitter);
+
+        // 发送历史消息（可选）
+        sendExistingMessages(emitter);
+
+        // 设置连接关闭/超时的清理逻辑
+        emitter.onCompletion(() -> onlineUsers.remove(userId));
+        emitter.onTimeout(() -> onlineUsers.remove(userId));
+        emitter.onError((e) -> onlineUsers.remove(userId));
+
+        return emitter;
+
+    }
+
+    /**
+     * 发送消息接口
+     * @param message 消息体（JSON格式）
+     */
+    @PostMapping("/send")
+    public ResponseEntity<String> sendMessage(@RequestBody Map<String, String> message) {
+        String sender = message.get("sender");
+        String receiver = message.get("receiver");
+        String content = message.get("content");
+
+        if (sender == null || content == null) {
+            return ResponseEntity.badRequest().body("参数缺失");
+        }
+
+        // 构造消息对象
+        Map<String, String> msg = new HashMap<>();
+        msg.put("sender", sender);
+        msg.put("receiver", receiver != null ? receiver : "all"); // 默认群发
+        msg.put("content", content);
+        msg.put("timestamp", LocalDateTime.now().toString());
+
+        // 存储消息
+        messageHistory.add(msg);
+
+        // 推送消息
+        if (receiver == null) {
+            // 群发：遍历所有在线用户
+            onlineUsers.forEach((userId, emitter) -> {
+                try {
+                    emitter.send(msg);
+                } catch (Exception e) {
+                    emitter.complete();
+                    onlineUsers.remove(userId);
+                }
+            });
+        } else {
+            // 私聊：查找指定接收者
+            ResponseBodyEmitter receiverEmitter = onlineUsers.get(receiver);
+            if (receiverEmitter != null) {
+                try {
+                    receiverEmitter.send(msg);
+                } catch (Exception e) {
+                    receiverEmitter.complete();
+                    onlineUsers.remove(receiver);
+                }
+            }
+        }
+
+        return ResponseEntity.ok("消息已发送");
+    }
+
+    // 发送历史消息给新连接的用户
+    private void sendExistingMessages(ResponseBodyEmitter emitter) {
+        try {
+            for (Map<String, String> msg : messageHistory) {
+                emitter.send(msg);
+            }
+        } catch (Exception e) {
+            emitter.complete();
+        }
+    }
+}

src/main/java/com/lqkj/cmlcp/module/jwt/controller/JwtController.java

@@ -6,6 +6,7 @@ import com.lqkj.cmlcp.module.authority.domain.LoginBody;
 import com.lqkj.cmlcp.module.authority.domain.UserInfo;
 import com.lqkj.cmlcp.module.authority.service.UserInfoService;
 import com.lqkj.cmlcp.module.jwt.service.JwtService;
+import com.lqkj.cmlcp.utils.RSAUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -48,13 +49,11 @@ public class JwtController {
     public Result<String> getToken(@RequestBody LoginBody loginBody){
         String userCode = loginBody.getUsername();
         String password = loginBody.getPassword();
-        String authCode = loginBody.getAuthCode();
-//        if (userCode.length() != 172 || password.length() != 172 || authCode.length() != 172) {
-//            return Result.fail("用户名或密码或授权码错误！");
-//        }
-//        userCode = RSAUtils.decryptBase64(userCode);
-//        password = RSAUtils.decryptBase64(password);
-//        authCode = RSAUtils.decryptBase64(authCode);
+        if (userCode.length() != 172 || password.length() != 172) {
+            return Result.fail("用户名或密码错误！");
+        }
+        userCode = RSAUtils.decryptBase64(userCode);
+        password = RSAUtils.decryptBase64(password);
 
         UserInfo userInfo = userInfoService.findByUserCode(userCode);
         if (userInfo == null) {
@@ -66,9 +65,9 @@ public class JwtController {
         if (!passwordEncoder.matches(password, userInfo.getPassword())) {
             return Result.fail(userInfoService.lockedUser(userInfo.getUserCode()));
         }
-        if (!authCode.equals(userInfo.getAuthorizationCode())) {
-            return Result.fail("授权码错误！");
-        }
+//        if (!authCode.equals(userInfo.getAuthorizationCode())) {
+//            return Result.fail("授权码错误！");
+//        }
         userInfoService.unlockedUser(userInfo.getUserCode());
 
         return Result.ok(jwtService.generateToken(userCode));
@@ -92,6 +91,6 @@ public class JwtController {
     )
     @PostMapping("/getAdminToken")
     public Result<String> getAdminToken() {
-        return Result.ok(jwtService.generateToken("meta-link"), "获取ADMIN-TOKEN");
+        return Result.ok(jwtService.generateToken("admin"), "获取ADMIN-TOKEN");
     }
 }

src/main/java/com/lqkj/cmlcp/module/zone/controller/ZoneInfoController.java

@@ -37,7 +37,7 @@ public class ZoneInfoController {
     }
 
     @PostMapping("/delete")
-    public Result delete(@RequestBody List<Integer> ids) {
+    public Result delete(@RequestParam List<Integer> ids) {
         zoneInfoService.delete(ids);
         return Result.ok();
     }

src/main/java/com/lqkj/cmlcp/module/zone/service/impl/ZoneInfoServiceImpl.java

@@ -47,6 +47,7 @@ public class ZoneInfoServiceImpl implements ZoneInfoService {
         return zoneInfoRepository.pageQuery(name, pageRequest);
     }
 
+    @Transactional
     @Override
     public void delete(List<Integer> ids) {
         zoneInfoRepository.deleteAllById(ids);