用户导入导出修改

business-service/src/main/java/com/ozs/service/entity/BaseUser.java

@@ -37,7 +37,7 @@ public class BaseUser implements Serializable {
     /** 用户账号 */
     private String userName;
 
-    /** 用户昵称 */
+    /** 真实姓名 */
     private String nickName;
 
     /** 用户邮箱 */

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -131,7 +131,26 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) {
+        List<Long> longs=new ArrayList<>();
         List<SysUser> list = userService.selectUserList(user);
+        for (SysUser sysUser : list) {
+            StringBuilder stringBuilder = new StringBuilder();
+            if (SysUser.isAdmin(sysUser.getId())) {
+                List<SysRole> roles = roleService.selectRoleAll();
+                for (SysRole role : roles) {
+                    longs.add(role.getRoleId());
+                }
+            } else {
+                longs= roleService.selectRoleListByUserId(sysUser.getId());
+            }
+            for (Long aLong : longs) {
+                SysRole sysRole = roleService.selectRoleById(aLong);
+                stringBuilder.append(sysRole.getRoleName());
+                stringBuilder.append(",");
+                String name = stringBuilder.toString();
+                sysUser.setRoleName(name.substring(0, name.length() - 1));
+            }
+        }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
     }

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -173,7 +173,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(ss);
                     buffer.append(";");
                 }
-                msgAlarmVice.setImageUrl(buffer.toString());
+                String url = buffer.toString();
+                msgAlarmVice.setImageUrl(url.substring(0, url.length() - 1));
                 msgAlarmVice.setCreateBy(admin.getUserId());
                 msgAlarmVice.setUpdateBy(admin.getUserId());
                 msgAlarmFrequencyService.save(msgAlarmVice);