用户逻辑修改

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

@@ -56,7 +56,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 所属工务段编码(单位id)
      */
     @Excel(name = "所属工务段编码(单位id)")
-    private String deptId;
+    private Integer deptId;
 
     /**
      * 行别(1上行2下行）

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

@@ -1,11 +1,13 @@
 package com.ozs.service.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.models.auth.In;
@@ -55,7 +57,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警里程位置
      */
-    private String alarmMile;
+    private Integer alarmMile;
 
     /**
      * 报警内容
@@ -126,4 +128,34 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 备注
      */
     private String remark;
+
+    /**
+     * 线路名称
+     */
+    @TableField(exist = false)
+    private String railwayName;
+
+    /**
+     * 监控范围开始里程位置
+     */
+    @TableField(exist = false)
+    private String beginMile;
+
+    /**
+     * 监控范围结束里程位置
+     */
+    @TableField(exist = false)
+    private String endMile;
+
+    /**
+     * 报警里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String alarmMiles;
+
+    /**
+     * 报警次数
+     */
+    @TableField(exist = false)
+    private Integer alarmCount;
 }

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

@@ -44,8 +44,7 @@ public class MsgAlarmResp implements Serializable {
     /**
      * 所属工务段编码(单位id)
      */
-    @Excel(name = "所属工务段编码(单位id)")
-    private String deptId;
+    private Integer deptId;
 
     /**
      * 报警里程位置
@@ -54,29 +53,15 @@ public class MsgAlarmResp implements Serializable {
 
 
     /**
-     * 监控范围开始里程位置
+     * 里程范围
      */
-    @Excel(name = "监控范围开始里程位置")
-    private Integer beginMile;
+    private String beginMile;
 
     /**
-     * 监控范围结束里程位置
+     * 监视相机经度纬度
      */
-    @Excel(name = "监控范围结束里程位置")
-    private Integer endMile;
-
-    /**
-     * 监视相机经度
-     */
-    @Excel(name = "监视相机经度")
     private String installLongitude;
 
-    /**
-     * 监视相机纬度
-     */
-    @Excel(name = "监视相机纬度")
-    private String installLatitude;
-    
     /**
      * 解除人
      */

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

@@ -2,6 +2,7 @@ package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModel;
@@ -27,9 +28,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 报警线路
+     * 线路编码
      */
-    private String alarmLine;
+    private String railwayCode;
 
     /**
      * 报警行别
@@ -44,17 +45,17 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     /**
      * 报警里程位置
      */
-    private String alarmMile;
+    private Integer alarmMile;
 
     /**
-     * 起始报警病害属性（可以给出泥石流的框定范围）
+     * 监控范围开始里程位置
      */
-    private String beginAlarmAttr;
-    
+    private String beginMile;
+
     /**
-     * 结束报警病害属性（可以给出泥石流的框定范围）
+     * 监控范围结束里程位置
      */
-    private String endAlarmAttr;
+    private String endMile;
 
     /**
      * 开始报警时间

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

@@ -8,6 +8,7 @@ import com.ozs.common.config.BaseConfig;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.base.BaseException;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.http.HttpUtils;
@@ -127,9 +128,12 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机台账管理信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
-        baseCameraManagement.setCreateBy(getUsername());
+        baseCameraManagement.setCreateBy(getUserId());
+        baseCameraManagement.setUpdateBy(getUserId());    
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
         baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
+        baseDynamicManagement.setUpdateBy(getUserId());
+        baseDynamicManagement.setCreateBy(getUserId());
         if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
             return AjaxResult.success();
         }
@@ -145,7 +149,7 @@ public class BaseCameraManagementController extends BaseController {
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机台账管理信息")
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
-        baseCameraManagement.setUpdateBy(getUsername());
+        baseCameraManagement.setUpdateBy(getUserId());
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return AjaxResult.success();
         }
@@ -280,10 +284,13 @@ public class BaseCameraManagementController extends BaseController {
         BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
         msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
         msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-        msgAlarmResp.setEndMile(baseCameraManagement.getEndMile());
-        msgAlarmResp.setBeginMile(baseCameraManagement.getBeginMile());
-        msgAlarmResp.setInstallLatitude(baseCameraManagement.getInstallLatitude());
-        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude());
+        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+        String endMile=begin+end+"km";
+        msgAlarmResp.setBeginMile(endMile);
+        String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+        msgAlarmResp.setAlarmMile(mile+"km");
+        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude()+","+baseCameraManagement.getInstallLatitude());
         msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
        msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
         return AjaxResult.success(msgAlarmResp);

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

@@ -90,7 +90,8 @@ public class BaseRailwayManagementController extends BaseController {
     @PostMapping("/saveRailwayManagement")
     @ApiOperation("新增线路管理表信息")
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
-        baseRailwayManagement.setCreateBy(getUsername());
+        baseRailwayManagement.setCreateBy(getUserId());
+        baseRailwayManagement.setUpdateBy(getUserId());
         if (baseRailwayManagementService.save(baseRailwayManagement)) {
             return AjaxResult.success();
         }
@@ -106,7 +107,7 @@ public class BaseRailwayManagementController extends BaseController {
     @PutMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
-        baseRailwayManagement.setUpdateBy(getUsername());
+        baseRailwayManagement.setUpdateBy(getUserId());
         if (baseRailwayManagementService.updateById(baseRailwayManagement)) {
             return AjaxResult.success();
         }

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

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
@@ -34,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -83,22 +84,30 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "报警信息分页")
     @PostMapping("/list")
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
+        LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getLineDir())) {
+            wrapper.eq(BaseCameraManagement::getRailwayCode, msgAlarmVo.getRailwayCode());
+        }
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMile())) {
+            wrapper.ge(BaseCameraManagement::getBeginMile, msgAlarmVo.getBeginMile());
+        }
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
+            wrapper.le(BaseCameraManagement::getEndMile, msgAlarmVo.getEndMile());
+        }
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
         LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(msgAlarmVo.getLineDir())) {
             lw.eq(MsgAlarm::getLineDir, msgAlarmVo.getLineDir());
         }
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            lw.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+        }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmType())) {
             lw.eq(MsgAlarm::getAlarmType, msgAlarmVo.getAlarmType());
         }
-        if (!StringUtils.isBlank(msgAlarmVo.getAlarmMile())) {
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMile())) {
             lw.eq(MsgAlarm::getAlarmMile, msgAlarmVo.getAlarmMile());
         }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginAlarmAttr())) {
-            lw.ge(MsgAlarm::getAlarmAttr, msgAlarmVo.getBeginAlarmAttr());
-        }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndAlarmAttr())) {
-            lw.le(MsgAlarm::getAlarmAttr, msgAlarmVo.getEndAlarmAttr());
-        }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginAlarmTime())) {
             lw.ge(MsgAlarm::getAlarmTime, msgAlarmVo.getBeginAlarmTime());
         }
@@ -109,6 +118,31 @@ public class MsgAlarmController extends BaseController {
             lw.eq(MsgAlarm::getIsLock, msgAlarmVo.getIsLock());
         }
         IPage<MsgAlarm> page = msgAlarmService.page(new Page<>(msgAlarmVo.getPageNum(), msgAlarmVo.getPageSize()), lw);
+        if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
+            List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
+                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
+                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
+                }
+                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
+                o.setAlarmMiles(mils);
+                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                o.setEndMile(end);
+                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                o.setBeginMile(begin);
+                o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto1);
+        }
         return AjaxResult.success(page);
     }
 
@@ -130,10 +164,13 @@ public class MsgAlarmController extends BaseController {
         BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
         msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
         msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-        msgAlarmResp.setEndMile(baseCameraManagement.getEndMile());
-        msgAlarmResp.setBeginMile(baseCameraManagement.getBeginMile());
-        msgAlarmResp.setInstallLatitude(baseCameraManagement.getInstallLatitude());
-        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude());
+        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+        String endMile=begin+"-"+end+"km";
+        msgAlarmResp.setBeginMile(endMile);
+        String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+        msgAlarmResp.setAlarmMile(mile+"km");
+        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude()+","+baseCameraManagement.getInstallLatitude());
         return AjaxResult.success(msgAlarmResp);
     }
 
@@ -143,8 +180,8 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult updateIsLock(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);
-        msgAlarm.setUpdateBy(getUsername());
-        msgAlarm.setReleasedBy(getUsername());
+        msgAlarm.setUpdateBy(getUserId());
+        msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }

hazard-sdk/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.2.15</version>
         </dependency>
+        <!-- 系统模块-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-system</artifactId>
+        </dependency>
         <!-- 业务代码-->
         <dependency>
             <groupId>com.ozs</groupId>

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.Result;
+import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppTokenUtils;
 import com.ozs.common.utils.StringUtils;
@@ -18,6 +19,7 @@ import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.SvcAddressService;
+import com.ozs.system.service.ISysUserService;
 import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
 import com.ozs.vo.RespGeoHazardMonitorVo;
@@ -65,6 +67,8 @@ public class GeoHazardMonitorTokenController {
     SvcAddressService svcAddressService;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    private ISysUserService userService;
 
 
     /**
@@ -144,6 +148,7 @@ public class GeoHazardMonitorTokenController {
             }
             MsgAlarm alarm = msgAlarmService.getOne(lw);
             log.info("alarm:{}", alarm);
+            SysUser sysUser = userService.selectUserById(1L);
             if (ObjectUtils.isEmpty(alarm)) {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
@@ -155,9 +160,9 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarm.setImageUrl(buffer.toString());
-//                msgAlarm.setCreateBy(getUsername());
-                // 根据线路编码找线路名称 字典表 -- 卜占一
-                // msgAlarm.setAlarmLine(baseCameraManagement.getRailwayName());
+                msgAlarm.setCreateBy(sysUser.getUserId());
+                msgAlarm.setUpdateBy(sysUser.getUserId());
+                msgAlarm.setAlarmMile(baseCameraManagement.getInstallMile());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
@@ -174,7 +179,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarmVice.setImageUrl(buffer.toString());
-//                msgAlarmVice.setCreateBy(getUsername());
+                msgAlarmVice.setCreateBy(sysUser.getUserId());
+                msgAlarmVice.setUpdateBy(sysUser.getUserId());
                 msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
@@ -217,10 +223,12 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("message", "信息编码为空！");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
+            SysUser sysUser = userService.selectUserById(1L);
             lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
+            baseDynamicManagement.setUpdateBy(sysUser.getUserId());
             log.info("reqDeviceVo:{}", baseDynamicManagement);
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);

pom.xml

@@ -14,6 +14,7 @@
     <properties>
         <base.version>1.0-SNAPSHOT</base.version>
         <hazard.version>1.0-SNAPSHOT</hazard.version>
+        <system.version>1.0-SNAPSHOT</system.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -39,6 +40,13 @@
                 <version>${base.version}</version>
             </dependency>
 
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.ozs</groupId>
+                <artifactId>base-system</artifactId>
+                <version>${base.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.ozs</groupId>
                 <artifactId>base-framework</artifactId>