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

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

@@ -45,7 +45,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "相机编码")
     private String cameraCode;
-
+    
     /**
      * 通道编号
      */
@@ -53,10 +53,10 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     private String channel;
 
     /**
-     * 所属工务段
+     * 所属工务段编码(单位id)
      */
-    @Excel(name = "所属工务段")
-    private Long deptId;
+    @Excel(name = "所属工务段编码(单位id)")
+    private String deptId;
 
     /**
      * 行别(1上行2下行）

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

@@ -46,11 +46,6 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
      */
     private Integer electricity;
 
-    /**
-     * 相机状态 1正常 2离线
-     */
-    private Integer cameraState;
-
     /**
      * 创建人
      */

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

@@ -57,11 +57,6 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     private String alarmMile;
 
-    /**
-     * 报警线路
-     */
-    private String alarmLine;
-
     /**
      * 报警内容
      */

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity.vo;
 
 
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
@@ -23,8 +24,10 @@ public class BaseRailwayManagementVo extends PageVo implements Serializable {
      */
     private Integer railwayType;
 
+
     /**
-     * 线路名称
+     * 线路编码（四位数字）
      */
-    private String railwayName;
+    @Excel(name = "编码")
+    private String railwayCode;
 }

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

@@ -9,8 +9,7 @@
 			a.camera_code AS cameraCode, 
 			a.line_dir AS lineDir, 
 			a.install_mile AS installMile, 
-			a.id AS id, 
-			a.public_works_section
+			a.id AS id
 		FROM
 		    base_camera_management AS a left join
 		    base_railway_management AS l  on  a.railway_code=l.railway_code

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

@@ -241,17 +241,7 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/totalNumberOfDevices")
     public AjaxResult totalNumberOfDevices() {
         long count = baseDeviceDynamicManagementService.count();
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-        lw.eq(BaseDeviceDynamicManagement::getCameraState, 1);
-        long onLine = baseDeviceDynamicManagementService.count(lw);
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-        wrapper.eq(BaseDeviceDynamicManagement::getCameraState, 2);
-        long offLine = baseDeviceDynamicManagementService.count(wrapper);
-        List<Long> size = new ArrayList<>();
-        size.add(count);
-        size.add(onLine);
-        size.add(offLine);
-        return success(size);
+        return success(count);
     }
 
     @ApiOperation("视频服务树形结构")

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

@@ -56,11 +56,11 @@ public class BaseRailwayManagementController extends BaseController {
     @PostMapping("/list")
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
-        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayName())) {
-            lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagementVo.getRailwayName());
+        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
+            lw.like(BaseRailwayManagement::getRailwayCode, "%" + baseRailwayManagementVo.getRailwayCode() + "%");
         }
         if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
-            lw.like(BaseRailwayManagement::getRailwayType, "%" + baseRailwayManagementVo.getRailwayType() + "%");
+            lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
         }
         IPage<BaseRailwayManagement> page = baseRailwayManagementService.page(new Page<BaseRailwayManagement>(baseRailwayManagementVo.getPageNum(), baseRailwayManagementVo.getPageSize()), lw);
         return AjaxResult.success(page);
@@ -87,7 +87,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @param baseRailwayManagement
      * @return
      */
-    @PostMapping("/saveLineManagement")
+    @PostMapping("/saveRailwayManagement")
     @ApiOperation("新增线路管理表信息")
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         baseRailwayManagement.setCreateBy(getUsername());
@@ -103,7 +103,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @param baseRailwayManagement
      * @return
      */
-    @PutMapping("/editLineManagement")
+    @PutMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         baseRailwayManagement.setUpdateBy(getUsername());
@@ -145,11 +145,11 @@ public class BaseRailwayManagementController extends BaseController {
     @PostMapping("/exportBaseLineManagement")
     public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
-        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayName())) {
-            lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagementVo.getRailwayName());
+        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
+            lw.like(BaseRailwayManagement::getRailwayCode, "%" + baseRailwayManagementVo.getRailwayCode() + "%");
         }
         if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
-            lw.like(BaseRailwayManagement::getRailwayType, "%" + baseRailwayManagementVo.getRailwayType() + "%");
+            lw.eq(BaseRailwayManagement::getRailwayType,  baseRailwayManagementVo.getRailwayType());
         }
         List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<>(BaseRailwayManagement.class);

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

@@ -79,9 +79,6 @@ public class MsgAlarmController extends BaseController {
     @PostMapping("/list")
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
-        if (!StringUtils.isBlank(msgAlarmVo.getAlarmLine())) {
-            lw.eq(MsgAlarm::getAlarmLine, msgAlarmVo.getAlarmLine());
-        }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getLineDir())) {
             lw.eq(MsgAlarm::getLineDir, msgAlarmVo.getLineDir());
         }

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

@@ -72,7 +72,7 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
-    @GetMapping(value = "/type/{dictType}")
+        @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);

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

@@ -79,7 +79,7 @@ public class SysLoginController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+        Long userId = SecurityUtils.getId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }

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

@@ -40,7 +40,7 @@ public class SysMenuController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)
     {
-        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        List<SysMenu> menus = menuService.selectMenuList(menu, getId());
         return success(menus);
     }
 
@@ -60,7 +60,7 @@ public class SysMenuController extends BaseController
     @GetMapping("/treeselect")
     public AjaxResult treeselect(SysMenu menu)
     {
-        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        List<SysMenu> menus = menuService.selectMenuList(menu, getId());
         return success(menuService.buildMenuTreeSelect(menus));
     }
 
@@ -70,7 +70,7 @@ public class SysMenuController extends BaseController
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
-        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        List<SysMenu> menus = menuService.selectMenuList(getId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));

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

@@ -154,12 +154,12 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds) {
-        if (ArrayUtils.contains(userIds, getUserId())) {
+    @DeleteMapping("/{Ids}")
+    public AjaxResult remove(@PathVariable Long[] Ids) {
+        if (ArrayUtils.contains(Ids, getId())) {
             return error("当前用户不能删除");
         }
-        return toAjax(userService.deleteUserByIds(userIds));
+        return toAjax(userService.deleteUserByIds(Ids));
     }
     ///**
     // * 删除用户
@@ -210,12 +210,12 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId) {
+    public AjaxResult authRole(@PathVariable("userId") Long id) {
         AjaxResult ajax = AjaxResult.success();
-        SysUser user = userService.selectUserById(userId);
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        SysUser user = userService.selectUserById(id);
+        List<SysRole> roles = roleService.selectRolesByUserId(id);
         ajax.put("user", user);
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(id) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         return ajax;
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/upload/UploadController.java

@@ -5,7 +5,11 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.MinioUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
+import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.service.BaseCameraManagementService;
+import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +35,9 @@ public class UploadController {
     @Resource
     MinioUtils minioUtils;
     @Autowired
-    MsgAlarmService msgAlarmService;
+    BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    BaseRailwayManagementService baseRailwayManagementService;
 
 
     @PostMapping("/upLoadImage")
@@ -48,20 +54,23 @@ public class UploadController {
 
             String imageName = image.getOriginalFilename();
             if (StringUtils.isNotBlank(imageName)) {
-                LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
+                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
-                    lw.orderByDesc(MsgAlarm::getAlarmTime);
+                    lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
+                }
+                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                    wrapper.eq(BaseRailwayManagement::getRailwayCode,baseCameraManagement.getCameraCode());
                 }
-                List<MsgAlarm> list = msgAlarmService.list(lw);
-                MsgAlarm msgAlarm = list.get(0);
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
                 String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
                 String filename = IdUtils.fastSimpleUUID() + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
-                String format1 = dateFormat1.format(msgAlarm.getAlarmTime());
-                String imgName = msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + format1 + "/" + filename;
+                String format1 = dateFormat1.format(dateFormat1.format(date));
+                String imgName = baseRailwayManagement.getRailwayName() + "/" + lineType + "/" + baseCameraManagement.getInstallMile() + format1 + "/" + filename;
                 minioUtils.minIoClientUpload(image.getInputStream(), imgName);
-                uploadFile = "/" + msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + "/" + format1 + "/" + filename;
+                uploadFile = "/" + baseRailwayManagement.getRailwayName() + "/" + lineType + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
 
             }
         } else {

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

@@ -221,7 +221,6 @@ public class GeoHazardMonitorTokenController {
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-            baseDynamicManagement.setCameraState(reqDeviceVo.getCameraState());
             log.info("reqDeviceVo:{}", baseDynamicManagement);
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);