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

.idea/encodings.xml

@@ -7,5 +7,7 @@
     <file url="file://$PROJECT_DIR$/hazard-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

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

@@ -4,6 +4,7 @@ import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 统计管理页面强求参数
@@ -33,4 +34,6 @@ public class AlarmStatisticResVo extends PageVo implements Serializable {
      * 灾害类型
      */
     private String alarmType;
+
+    private List<Long> ids;
 }

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

@@ -5,6 +5,7 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -56,4 +57,6 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
+
+    private List<Long> ids;
 }

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

@@ -5,6 +5,7 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -30,4 +31,6 @@ public class BaseRailwayManagementVo extends PageVo implements Serializable {
      */
     @Excel(name = "编码")
     private String railwayCode;
+
+    private List<Long> ids;
 }

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

@@ -93,4 +93,6 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 解除报警类型1实报2误报
      */
     private Integer releasedType;
+
+    private List<Long> ids;
 }

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

@@ -14,12 +14,8 @@ import com.ozs.service.entity.*;
 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.mapper.BaseCameraManagementMapper;
+import com.ozs.service.mapper.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.service.mapper.BaseDeptMapper;
-import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
-import com.ozs.service.mapper.BaseUserMapper;
-import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.BaseUserService;
@@ -59,6 +55,10 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseDeptMapper baseDeptMapper;
     @Autowired
     private BaseRailwayManagementService baseRailwayManagementService;
+    @Autowired
+    private CameraLogDetailMapper cameraLogDetailMapper;
+    @Autowired
+    private CameraUpdateLogMapper cameraUpdateLogMapper;
 
     /**
      * 相机台账管理表导入
@@ -338,6 +338,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
 //            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            // 判断
             wrapper.and((wp) -> {
                 wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
             });

business-service/src/main/java/com/ozs/service/utils/PublishCallback.java

@@ -27,7 +27,7 @@ public class PublishCallback implements MqttCallback {
     @Override
     public void connectionLost(Throwable cause) {
         // 连接丢失后，一般在这里面进行重连
-//        System.out.println("连接断开，可以做重连");
+        System.out.println("连接断开，可以做重连"+cause);
     }
 
     //接收到已经发布的 QoS 1 或 QoS 2 消息的传递令牌时调用

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -167,6 +167,7 @@ public class PublishClient {
         for (String code : baseCameraVersionVo.getCameraCodeList()) {
             try {
                 PublishClient server = new PublishClient("update_" + code, "update_" + code);
+                log.info("update_" + code);
                 UpdateDeviceSn updateDeviceSn = new UpdateDeviceSn();
                 updateDeviceSn.setName("UpdateRequest");
                 updateDeviceSn.setType(Integer.valueOf(baseCameraVersionVo.getUpgradeType()));

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

@@ -49,6 +49,12 @@
             <if test="installMile != null and installMile != 0">
                 and a.install_mile =#{installMile}
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">

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

@@ -143,6 +143,12 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
@@ -315,6 +321,12 @@
             <if test="endMile != null and endMile != 0">
                 and b.end_mile &lt;=#{endMile}
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">

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

@@ -884,7 +884,7 @@ public class BaseCameraManagementController extends BaseController {
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-                String endMile = "[" + begin + "]-[" + end + "]";
+                String endMile =   begin + "~" + end ;
                 msgAlarmResp.setBeginMile(endMile);
             }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());

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

@@ -270,6 +270,9 @@ public class BaseRailwayManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
             lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
         }
+        if (baseRailwayManagementVo.getIds().size()>0){
+            lw.in(BaseRailwayManagement::getId,baseRailwayManagementVo.getIds());
+        }
         List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<>(BaseRailwayManagement.class);
         util.exportExcel(response, list, "线路台账数据");

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

@@ -509,18 +509,13 @@ public class MsgAlarmController extends BaseController {
         wrapper.eq("camera_code", cameraCode);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarm> list = msgAlarmService.list(wrapper);
-        if (list.size() > 0) {
-            for (MsgAlarm msgAlarm : list) {
-                msgAlarm.setFailureToAlarm(1);
-            }
-            return AjaxResult.success(list);
-        } else {
-            List<MsgAlarm> msgAlarmList = new ArrayList<>();
-            MsgAlarm msgAlarm = new MsgAlarm();
-            msgAlarm.setFailureToAlarm(2);
-            msgAlarmList.add(msgAlarm);
-            return AjaxResult.success(msgAlarmList);
-        }
+//        if (list.size() > 0) {
+//            for (MsgAlarm msgAlarm : list) {
+//                msgAlarm.setFailureToAlarm(1);
+//            }
+//            return AjaxResult.success(list);
+//        } 
+        return AjaxResult.success(list);
     }
 
     /**

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

@@ -151,7 +151,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUserVo sysUserVo) {
+    public void export(HttpServletResponse response, @RequestBody SysUserVo sysUserVo) {
         List<Long> longs = new ArrayList<>();
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         List<SysUser> usetList = userService.usetList(sysUserVo);

hazard-sdk/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-<!--	<property name="log.path" value="/home/base/logs" />-->
-    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>
+	<property name="log.path" value="/home/base/logs" />
+<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />