Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/vo/CameraTreeVo.java

@@ -0,0 +1,29 @@
+package com.ozs.service.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/31 16:06
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CameraTreeVo {
+    /**
+     * 线路
+     */
+    private String railwayCode;
+
+    /**
+     * 行别
+     */
+    private Integer lineDir;
+
+    /**
+     * 里程位置
+     */
+    private String mils;
+}

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -92,5 +92,8 @@ public class MsgAlarmResp implements Serializable {
     /** 报警图片地址 */
     private List<String> imageUrls;
 
-
+    /**
+     * 所属工务段编码(单位名称)
+     */
+    private String deptName;
 }

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

@@ -44,6 +44,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
         Map<String, CameraTree> map = new HashMap<>();
         List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name, lineDir, beginMile);
         if (list.size() > 0) {
+            Integer cameraName = 0;
             for (BaseCameraManagementDto o : list) {
                 // 线路
                 CameraTree build = CameraTree.builder()
@@ -83,7 +84,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 // 摄像头
                 CameraTree build2 = CameraTree.builder()
                         .code(o.getCameraCode())
-                        .name(o.getCameraCode())
+                        .name("相机" + cameraName++)
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();

business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml

@@ -255,7 +255,7 @@
     </select>
 
     <select id="countMsg" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="java.lang.Integer">
-        select count(1) from msg_alarm AS a  join base_camera_management AS b on a.camera_code = b.camera_code
+        select count(1) from msg_alarm AS a join base_camera_management AS b on a.camera_code = b.camera_code
         <where>
             <if test="!dsFlay">
                 and

hazard-admin/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
+            <version>1.18.14</version>
         </dependency>
 
         <!-- spring-boot-devtools -->

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -28,11 +28,7 @@ import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVos;
-import com.ozs.service.entity.vo.BaseCameraResVo;
-import com.ozs.service.entity.vo.MsgAlarmResp;
+import com.ozs.service.entity.vo.*;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
@@ -618,17 +614,23 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @ApiOperation("视频服务树形结构")
-    @GetMapping("/cameraTree")
+    @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult cameraTree(@RequestParam(value = "railwayCode", required = false) String railwayCode,
-                                 @RequestParam(value = "lineDir", required = false) Integer lineDir,
-                                 @RequestParam(value = "mils", required = false) String mils) {
+    public AjaxResult cameraTree(@RequestBody CameraTreeVo baseCameraResVo) {
+        String railwayCode = null;
+        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+            railwayCode = baseCameraResVo.getRailwayCode();
+        }
+        Integer lineDir = null;
+        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+            lineDir = baseCameraResVo.getLineDir();
+        }
         Integer milsInt = null;
-        if (!StringUtils.isEmpty(mils)) {
-            if (!mils.matches(PATTERN)) {
+        if (!StringUtils.isEmpty(baseCameraResVo) || !ObjectUtils.isEmpty(baseCameraResVo.getMils())) {
+            if (!baseCameraResVo.getMils().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
             }
-            milsInt = AppendUtils.stringSplit(mils);
+            milsInt = AppendUtils.stringSplit(baseCameraResVo.getMils());
         }
         CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir, milsInt);
         List<CameraTree> children = cameraTree.getChildren();
@@ -768,6 +770,8 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
+            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            msgAlarmResp.setDeptName(sysDept.getDeptName());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return error("该相机编码在相机台账表中不存在");

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -19,6 +19,7 @@ import com.ozs.service.entity.vo.*;
 import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.*;
 import com.ozs.system.service.DataScoreUtil;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -85,6 +86,8 @@ public class MsgAlarmController extends BaseController {
     private DataScoreUtil dataScoreUtil;
     @Resource
     private BaseUserService baseUserService;
+    @Autowired
+    private ISysDeptService deptService;
 
     /**
      * web更多消息-总数，已读数
@@ -205,7 +208,11 @@ public class MsgAlarmController extends BaseController {
                 o.setEndMile(end);
                 String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                 o.setBeginMile(begin);
-                o.setAlarmCount((int) msgAlarmFrequencyService.count());
+                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+                if (!ObjectUtils.isEmpty(o.getAlarmId())) {
+                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
+                }
+                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -279,6 +286,8 @@ public class MsgAlarmController extends BaseController {
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            msgAlarmResp.setDeptName(sysDept.getDeptName());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");

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

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 
@@ -14,6 +15,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
 import com.ozs.common.core.domain.vo.SysUserVo;
+import com.ozs.service.entity.BaseUser;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.system.domain.SysRoleMenu;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysMenuService;
@@ -56,8 +59,7 @@ import com.ozs.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
-{
+public class SysRoleController extends BaseController {
     @Autowired
     private ISysRoleService roleService;
 
@@ -76,6 +78,8 @@ public class SysRoleController extends BaseController
     private DataScoreUtil dataScoreUtil;
     @Autowired
     private ISysMenuService menuService;
+    @Resource
+    private BaseUserService baseUserService;
 
 //    @PreAuthorize("@ss.hasPermi('system:role:list')")
 //    @GetMapping("/list")
@@ -92,7 +96,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
-        vo= (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(),vo);
+        vo = (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(), vo);
         IPage<SysRole> page = roleService.queryPage(vo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
@@ -104,8 +108,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysRole role)
-    {
+    public void export(HttpServletResponse response, SysRole role) {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
         util.exportExcel(response, list, "角色数据");
@@ -117,16 +120,15 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     @Log(title = "角色管理", businessType = BusinessType.MESSAGE)
-    public AjaxResult getInfo(@PathVariable Long roleId)
-    {
+    public AjaxResult getInfo(@PathVariable Long roleId) {
 //        roleService.checkRoleDataScope(roleId);
         SysRole sysRole = roleService.selectRoleById(roleId);
-        if (sysRole.getRoleKey().equals(("admin"))){
+        if (sysRole.getRoleKey().equals(("admin"))) {
             List<SysMenu> list = menuService.list();
             List<Long> collect = list.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
             Long[] strArr = collect.toArray(new Long[collect.size()]);
             sysRole.setMenuIds(strArr);
-        }else {
+        } else {
             List<Long> rolePerms = menuService.selectMenu(sysRole.getRoleId());
             Long[] strArr = rolePerms.toArray(new Long[rolePerms.size()]);
             sysRole.setMenuIds(strArr);
@@ -140,14 +142,10 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(getUserId());
@@ -162,32 +160,31 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
 //        roleService.checkRoleAllowed(role);
 //        roleService.checkRoleDataScope(role.getRoleId());
-        if (!ObjectUtils.isEmpty(role.getRoleKey())){
-            role.setRoleKey("admin");
-        }
-        if (!ObjectUtils.isEmpty(role.getStatus())){
-            role.setStatus("1");
+        String roleKey = roleService.getRoleKey(role.getRoleId());
+        if ("admin".equals(roleKey)) {
+            if (!ObjectUtils.isEmpty(role.getRoleKey())) {
+                role.setRoleKey("admin");
+            }
+            if (!ObjectUtils.isEmpty(role.getStatus())) {
+                role.setStatus("1");
+            }
+        } else {
+            if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+                return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            }
         }
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
         role.setUpdateBy(getUserId());
 
-        if (roleService.updateRole(role) > 0)
-        {
+        if (roleService.updateRole(role) > 0) {
             // 更新缓存用户权限
             LoginUser loginUser = getLoginUser();
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
-            {
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
                 loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
@@ -203,8 +200,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
-    {
+    public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.authDataScope(role));
@@ -216,8 +212,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
-    {
+    public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         role.setUpdateBy(getUsername());
@@ -230,8 +225,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
@@ -241,8 +235,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
     @Log(title = "角色管理", businessType = BusinessType.OTHER)
-    public AjaxResult optionselect()
-    {
+    public AjaxResult optionselect() {
         return success(roleService.selectRoleAll());
     }
 
@@ -252,8 +245,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
     @Log(title = "角色管理", businessType = BusinessType.SELECT)
-    public TableDataInfo allocatedList(SysUser user)
-    {
+    public TableDataInfo allocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectAllocatedList(user);
         return getDataTable(list);
@@ -265,8 +257,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
     @Log(title = "角色管理", businessType = BusinessType.SELECT)
-    public TableDataInfo unallocatedList(SysUser user)
-    {
+    public TableDataInfo unallocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
         return getDataTable(list);
@@ -278,8 +269,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
-    {
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -289,8 +279,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
@@ -300,8 +289,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
@@ -312,8 +300,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
     @Log(title = "角色管理", businessType = BusinessType.OTHER)
-    public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));