Merge remote-tracking branch 'origin/master'

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -117,16 +117,16 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                             baseDeviceDynamicManagement.setCreateBy(userId);
                             baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                             successNum++;
-                            successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
-                        }else {
+                            successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                        } else {
                             failureNum++;
-                            String msg = "<br/>" + failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";
+                            String msg = failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";
                             failureMsg.append(msg);
-                            log.error(msg);  
+                            log.error(msg);
                         }
-                    }else {
+                    } else {
                         failureNum++;
-                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
                         failureMsg.append(msg);
                         log.error(msg);
                     }
@@ -147,22 +147,22 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         baseDeviceDynamicManagement.setUpdateBy(userId);
                         baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
                         successNum++;
-                        successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+                        successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
                     } else {
                         failureNum++;
-                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
                         failureMsg.append(msg);
                         log.error(msg);
                     }
 
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");
+                    failureMsg.append(failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
+                String msg = failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
+                failureMsg.append(msg);
                 log.error(msg, e);
             }
         }

business-service/src/main/java/com/ozs/service/service/impl/BaseRailwayManagementServiceImpl.java

@@ -67,25 +67,25 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
                         railwayManagement.setCreateBy(userId);
                         baseRailwayManagementMapper.insert(railwayManagement);
                         successNum++;
-                        successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
+                        successMsg.append(successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
                     } else if (updateSupport) {
                         BeanValidators.validateWithException(validator, railwayManagement);
                         railwayManagement.setUpdateBy(userId);
                         baseRailwayManagementMapper.update(railwayManagement, lw);
                         successNum++;
-                        successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 更新成功");
+                        successMsg.append(successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 更新成功");
                     } else {
                         failureNum++;
-                        failureMsg.append("<br/>" + failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 已存在");
+                        failureMsg.append(failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 已存在");
                     }
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、线路名称 " + railwayManagement.getRailwayName() + " 已存在");
+                    failureMsg.append( failureNum + "、线路名称 " + railwayManagement.getRailwayName() + " 已存在");
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
+                String msg = failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入失败：";
+                failureMsg.append(msg);
                 log.error(msg, e);
             }
         }

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

@@ -163,9 +163,8 @@ public class SysDictTypeController extends BaseController {
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
-        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+    public AjaxResult optionselect(Integer dataType) {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(dataType);
         return success(dictTypes);
     }
 }

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

@@ -44,9 +44,16 @@ public class SysMenuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
-    {
+    public AjaxResult list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getId());
+        for (SysMenu menuA : menus) {
+            for (SysMenu menu1 : menus) {
+                if (menu1.getMenuId().compareTo(menuA.getParentId()) == 0) {
+                    menuA.setParentName(menu1.getMenuName());
+                    break;
+                }
+            }
+        }
         return success(menus);
     }
 
@@ -55,8 +62,7 @@ public class SysMenuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
-    {
+    public AjaxResult getInfo(@PathVariable Long menuId) {
         return success(menuService.selectMenuById(menuId));
     }
 
@@ -64,8 +70,7 @@ public class SysMenuController extends BaseController {
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
-    {
+    public AjaxResult treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getId());
         return success(menuService.buildMenuTreeSelect(menus));
     }
@@ -74,8 +79,7 @@ public class SysMenuController extends BaseController {
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenu/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -89,14 +93,10 @@ public class SysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(getUsername());
@@ -109,18 +109,12 @@ public class SysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
             return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(getUsername());
@@ -133,8 +127,7 @@ public class SysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
-    {
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
             return warn("存在子菜单,不允许删除");
         }

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -60,8 +60,11 @@ public class WebSocketConteoller extends BaseController {
             wrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
         }
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+        log.info("baseCameraManagement-----"+baseCameraManagement);
         // 获取推送人ID列表
+        log.info("publish-----"+baseCameraManagement.getCreateBy()+"-------------"+baseCameraManagement.getDeptId());
         Set<String> set = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
+        log.info("set-----"+set);
         String[] list = set.toArray(new String[set.size()]);
         List<String> userIdList = new ArrayList<>(set);
         MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
@@ -81,6 +84,7 @@ public class WebSocketConteoller extends BaseController {
         if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+            log.info("publish--------"+objects);
             msgAlarmResp.setImageUrls(objects);
         }
         if (!StringUtils.isEmpty(msgAlarm.getId())) {

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

@@ -158,13 +158,14 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(ss);
                     buffer.append(";");
                 }
-                msgAlarm.setImageUrl(buffer.toString());
+                String url = buffer.toString();
+                msgAlarm.setImageUrl(url.substring(0, url.length() - 1));
                 msgAlarm.setCreateBy(admin.getUserId());
                 msgAlarm.setUpdateBy(admin.getUserId());
                 msgAlarm.setAlarmMile(baseCameraManagement.getInstallMile());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
-                msgAlarmVice.setImageUrl(buffer.toString());
+                msgAlarmVice.setImageUrl(url.substring(0, url.length() - 1));
                 msgAlarmVice.setCreateBy(admin.getUserId());
                 msgAlarmVice.setUpdateBy(admin.getUserId());
                 msgAlarmFrequencyService.save(msgAlarmVice);
@@ -194,9 +195,10 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setCancelTime(null);
             }
             try {
+                MsgAlarm alarms = msgAlarmService.getOne(lw);
                 log.info("sdkUrl：{}", sdkUrl);
-                log.info("alarmJSON ：{}", JSON.toJSONString(alarm));
-                String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(alarm));
+                log.info("alarmJSON ：{}", JSON.toJSONString(alarms));
+                String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(alarms));
                 log.info("result：{}", result);
             } catch (Exception e) {
                 log.info(e.getMessage());