相机列表，角色列表

src/main/java/com/fdkankan/fusion/controller/TmCameraController.java

@@ -50,7 +50,7 @@ public class TmCameraController {
                                             @RequestParam(value = "pageSize", required = false,defaultValue = "10") Long pageSize,
                                             @RequestParam(value = "snCode" , required = false) String snCode,
                                             @RequestParam(value = "deptId", required = false) String deptId,
-                                            @RequestParam(value = "type", required = false) int type
+                                            @RequestParam(value = "type", required = false) Integer type
     ) {
        return ResultData.ok(tmCameraService.pageList(pageNum,pageSize,snCode,deptId,type));
     }

src/main/java/com/fdkankan/fusion/controller/TmRoleController.java

@@ -1,6 +1,10 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.service.ITmRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +18,15 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-07-28
  */
 @RestController
-@RequestMapping("/fusion/tmRole")
+@RequestMapping("/web/role")
 public class TmRoleController {
 
+    @Autowired
+    private ITmRoleService roleService;
+
+    @GetMapping("/getAllRoleList")
+    public ResultData getAllRoleList(){
+        return ResultData.ok(roleService.list());
+    }
 }
 

src/main/java/com/fdkankan/fusion/controller/TmUserController.java

@@ -88,8 +88,8 @@ public class TmUserController {
     }
 
     @GetMapping("/getUserListSelect")
-    public ResultData getUserListSelect() {
-        return ResultData.ok(tmUserService.getUserListSelect());
+    public ResultData getUserListSelect( @RequestParam(name = "deptId", required = false) String deptId) {
+        return ResultData.ok(tmUserService.getUserListSelect(deptId));
     }
 }
 

src/main/java/com/fdkankan/fusion/service/ITmUserService.java

@@ -40,5 +40,5 @@ public interface ITmUserService extends IService<TmUser> {
 
     PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
 
-    Object getUserListSelect();
+    Object getUserListSelect(String deptId);
 }

src/main/java/com/fdkankan/fusion/service/impl/TmCameraServiceImpl.java

@@ -184,18 +184,19 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
         HashMap<String,String> deptIdMap = new HashMap<>();
         HashMap<String,String> deptNameMap = new HashMap<>();
         for (TmCamera record : page.getRecords()) {
-            deptIdMap.put(record.getCameraSn(),record.getDeptId());
+            deptIdMap.put(record.getCameraSn().toUpperCase(),record.getDeptId());
         }
-        Set<String> strings = deptIdMap.keySet();
-        if(strings.size() >0){
-            List<TmDepartment> departments = tmDepartmentService.listByIds(strings);
+        Collection<String> values = deptIdMap.values();
+        if(values.size() >0){
+            List<TmDepartment> departments = tmDepartmentService.listByIds(values);
             for (TmDepartment department : departments) {
                 deptNameMap.put(department.getId(),department.getName());
             }
         }
         List<CameraVo> list =  fdkkResponse.getData();
         for (CameraVo cameraVo : list) {
-            String deptIdO = deptIdMap.get(cameraVo.getSnCode());
+            System.out.println(cameraVo.getSnCode());
+            String deptIdO = deptIdMap.get(cameraVo.getSnCode().toUpperCase());
             cameraVo.setDeptId(deptIdO);
             cameraVo.setDeptName(deptNameMap.get(deptIdO));
         }

src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -280,8 +280,11 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
     }
 
     @Override
-    public Object getUserListSelect() {
+    public Object getUserListSelect(String deptId) {
         LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(deptId)){
+            wrapper.eq(TmUser::getDeptId,deptId);
+        }
         List<String> deptIds = tmDepartmentService.getDeptIds();
         if(deptIds.size() <=0){
             deptIds.add("not-dept");

src/main/resources/application-test.yaml

@@ -3,8 +3,8 @@ spring:
     type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
     driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
     #120.25.146.52
-    #url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    #url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: root
     password: JK123456%JIK
     hikari: