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

 Conflicts:

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

.idea/compiler.xml

@@ -7,9 +7,9 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="base-admin" />
         <module name="hazard-admin" />
         <module name="hazard-sdk" />
+        <module name="base-admin" />
         <module name="business-service" />
       </profile>
     </annotationProcessing>

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

@@ -34,11 +34,11 @@ public class BaseVersionCameraParam {
     /**
      * key
      */
-    private String key;
+    private String paramKey;
     /**
      * value
      */
-    private String value;
+    private String paramValue;
     /**
      * 创建人
      */

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

@@ -75,4 +75,10 @@ public class CameraLogDetail implements Serializable {
      */
     @Excel(name = "备注")
     private String remark;
+
+    /**
+     * 升级失败原因failure_reason
+     */
+    @Excel(name = "升级失败原因")
+    private String failureReason;
 }

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

@@ -66,6 +66,12 @@ public class CameraUpdateLog implements Serializable {
      */
     private String createBy;
 
+    /**
+     * 创建人名称
+     */
+    @TableField(exist = false)
+    private String createByName;
+
     /**
      * 创建时间
      */

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

@@ -320,6 +320,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+        }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
         return baseCameraManagements;
     }

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

@@ -49,6 +49,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
     CameraLogDetailService cameraLogDetailService;
 
     @Override
+    @Transactional
     public AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId) {
         LambdaQueryWrapper<BaseCameraVersion> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseCameraVersion) && !StringUtils.isEmptySunhh(baseCameraVersion.getVersionNum())) {
@@ -161,17 +162,17 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
         if ("3".equals(baseCameraVersionVo.getUpgradeType())){
             List<BaseVersionCameraParam> baseVersionCameraParamList = baseCameraVersionVo.getBaseVersionCameraParamList();
             for (BaseVersionCameraParam baseVersionCameraParam : baseVersionCameraParamList) {
-                if ("threshold".equals(baseVersionCameraParam.getKey())){
-                    PublishClient.confidenceCoefficient(baseCameraVersionVo,baseVersionCameraParam.getValue());
+                if ("threshold".equals(baseVersionCameraParam.getParamKey())) {
+                    PublishClient.confidenceCoefficient(baseCameraVersionVo, baseVersionCameraParam.getParamValue());
                     new SubscribeClient("config", "config").start();
-                }else if("fps".equals(baseVersionCameraParam.getKey())){
-                    PublishClient.configFrameRate(baseCameraVersionVo,baseVersionCameraParam.getValue());
+                } else if ("fps".equals(baseVersionCameraParam.getParamKey())) {
+                    PublishClient.configFrameRate(baseCameraVersionVo, baseVersionCameraParam.getParamValue());
                     new SubscribeClient("config", "config").start();
                 }
             }
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
         new SubscribeClient("update", "update").start();
-        return AjaxResult.success();
+        return AjaxResult.success("已经为您提交升级申请，请您到“日志管理>相机升级日志”页面查看升级结果。");
     }
 }

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

@@ -33,8 +33,6 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
 
     @Override
     public CameraTree cameraTree(CameraTreeVo cameraTreeVo) {
-
-
         //1 父
         CameraTree cameraTree = CameraTree.builder()
                 .name("相机树")

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

@@ -0,0 +1,84 @@
+package com.ozs.service.service.impl;
+
+import com.ozs.common.utils.MinioUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * @author wyy
+ * @subject
+ * @creat 2023/4/26
+ */
+@Service
+public class CameraCaptureService {
+    private static final Logger log = LoggerFactory.getLogger(CameraCaptureService.class);
+    @Resource
+    MinioUtils minioUtils;
+
+    public void getCapture(URL url, String fileName) throws IOException {
+        HttpURLConnection connection = null;
+        BufferedInputStream bis = null;
+        BufferedOutputStream bos = null;
+        try {
+            connection = (HttpURLConnection) url.openConnection();
+            // http正文内，因此需要设为true
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            // Post 请求不能使用缓存
+            connection.setUseCaches(false);
+            //设置本次连接是否自动重定向
+            connection.setInstanceFollowRedirects(true);
+
+            connection.setRequestMethod("GET");
+            connection.setRequestProperty("Accept-Language", "zh,zh-CN;q=0.9");
+            connection.setRequestProperty("connection", "keep-alive");
+            //设置参数类型是json格式
+            connection.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+            connection.setRequestProperty("Accept","application/json");
+            //connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charsert", "UTF-8");
+            //设置读取时间为30秒
+            connection.setConnectTimeout(30 * 1000);
+            connection.setReadTimeout(30 * 1000);
+            connection.connect();
+
+            // 返回流
+            System.out.println("responseCode=" + connection.getResponseCode());
+            log.info("responseCode="+connection.getResponseCode());
+            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                InputStream input = connection.getInputStream();
+                bis = new BufferedInputStream(input);
+                minioUtils.minIoClientUpload(bis, fileName);
+                FileOutputStream output = new FileOutputStream(fileName);
+                bos = new BufferedOutputStream(output);
+                byte[] buffer = new byte[1024];
+                int size = 0;
+                while ((size = bis.read(buffer, 0, 1024)) != -1) {
+                    bos.write(buffer, 0, size);
+                }
+                bos.flush();
+            }
+        } catch (Exception e) {
+            //先关闭外层的缓冲流，再关闭内层的流,但是在关闭外层流的同时，
+            //内层流也会自动的进行关闭，关于内层流的关闭，可以省略
+            e.printStackTrace();
+        } finally {
+            if (bis != null) {
+                bis.close();
+            }
+//            if (bos != null) {
+//                bos.close();
+//            }
+            if (connection != null) {
+                connection.disconnect();
+            }
+//            os.close();
+        }
+    }
+}

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

@@ -12,26 +12,25 @@
 			a.id AS id
 		FROM
 		    base_camera_management AS a inner join
-		    base_railway_management AS l  on  a.railway_code=l.railway_code
+		    base_railway_management AS l on a.railway_code = l.railway_code
 		<where>
 			<if test="railwayCode != null and railwayCode !=''">
-				concat(l.railway_name,a.camera_code)
-				like concat("%",#{railwayCode},"%")
+				and concat(l.railway_name,a.camera_code,a.railway_code) like concat("%",#{railwayCode},"%")
 			</if>
 			<if test="lineDir != null and lineDir != ''">
-				line_dir = #{lineDir}
+				and line_dir = #{lineDir}
 			</if>
 			<if test="mils != null and mils != ''">
-				concat(a.install_mile, a.begin_mile, a.end_mile) = #{mils}
+				and (a.install_mile = #{mils} or a.begin_mile = #{mils} or a.end_mile = #{mils})
 			</if>
 			<if test="!dsFlay">
 				and
 				<trim prefix="(" prefixOverrides="or" suffix=")">
 					<if test="dsUserId != null and dsUserId != ''">
-						or a.create_by=#{dsUserId}
+						or a.create_by = #{dsUserId}
 					</if>
 					<if test="dsDeptId != null and dsDeptId != 0">
-						or  a.dept_id=#{dsDeptId}
+						or  a.dept_id = #{dsDeptId}
 					</if>
 					<if test="dsDeptIds != null">
 						or a.dept_id in

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

@@ -75,6 +75,9 @@ public class BaseCameraVersionController extends BaseController {
     @PostMapping("/cameraAllList")
     @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
     public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
+        if (StringUtils.isEmptySunhh(baseCameraManagement) || StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+            return AjaxResult.error("相机版本id不能为空！");
+        }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.cameraAllList(baseCameraManagement);
         return AjaxResult.success(baseCameraManagements);
     }
@@ -129,8 +132,8 @@ public class BaseCameraVersionController extends BaseController {
     public AjaxResult cameraVersionAdd(@RequestBody BaseCameraVersion baseCameraVersion) {
         if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getVersionNum())
                 || StringUtils.isEmptySunhh(baseCameraVersion.getVersionName())
-                || StringUtils.isEmptySunhh(baseCameraVersion.getVersionAddress())) {
-            return AjaxResult.error("相机版本号、版本名称、版本地址不能为空！");
+                || StringUtils.isEmptySunhh(baseCameraVersion.getUpgradeType())) {
+            return AjaxResult.error("相机版本号、版本名称、版本类型 不能为空！");
         }
         return baseCameraVersionService.cameraVersionAdd(baseCameraVersion, getUserId());
     }

hazard-admin/src/main/java/com/ozs/web/controller/common/PictureController.java

@@ -9,6 +9,7 @@ import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.MsgAlarmService;
+import com.ozs.service.service.impl.CameraCaptureService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
@@ -42,7 +43,7 @@ public class PictureController {
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
-    MinioUtils minioUtils;
+    CameraCaptureService cameraCaptureService;
 
     /**
      * 获取图片
@@ -66,7 +67,7 @@ public class PictureController {
                     URL url = new URL("http://124.70.58.209:18891/snap/"+l.getCameraCode()+"/"+l.getChannel());
                     String fileName = "cameraPicture/"+l.getCameraCode()+"_"+uuid +".jpg";
                     log.info("fileName="+fileName);
-                    getCapture(url, fileName);
+                    cameraCaptureService.getCapture(url, fileName);
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
                 } catch (IOException e) {
@@ -76,64 +77,4 @@ public class PictureController {
         });
         return AjaxResult.success(list);
     }
-    public void getCapture(URL url,String fileName) throws IOException {
-        HttpURLConnection connection = null;
-        BufferedInputStream bis = null;
-        BufferedOutputStream bos = null;
-        try {
-            connection = (HttpURLConnection) url.openConnection();
-            // http正文内，因此需要设为true
-            connection.setDoOutput(true);
-            connection.setDoInput(true);
-            // Post 请求不能使用缓存
-            connection.setUseCaches(false);
-            //设置本次连接是否自动重定向
-            connection.setInstanceFollowRedirects(true);
-
-            connection.setRequestMethod("GET");
-            connection.setRequestProperty("Accept-Language", "zh,zh-CN;q=0.9");
-            connection.setRequestProperty("connection", "keep-alive");
-            //设置参数类型是json格式
-            connection.setRequestProperty("Content-Type", "application/json;charset=utf-8");
-            connection.setRequestProperty("Accept","application/json");
-            //connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-            connection.setRequestProperty("Charsert", "UTF-8");
-            //设置读取时间为30秒
-            connection.setConnectTimeout(30 * 1000);
-            connection.setReadTimeout(30 * 1000);
-            connection.connect();
-
-            // 返回流
-            System.out.println("responseCode=" + connection.getResponseCode());
-            log.info("responseCode="+connection.getResponseCode());
-            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                InputStream input = connection.getInputStream();
-                bis = new BufferedInputStream(input);
-                minioUtils.minIoClientUpload(input, fileName);
-//                FileOutputStream output = new FileOutputStream(fileName);
-//                bos = new BufferedOutputStream(output);
-//                byte[] buffer = new byte[1024];
-//                int size = 0;
-//                while ((size = bis.read(buffer, 0, 1024)) != -1) {
-//                    bos.write(buffer, 0, size);
-//                }
-//                bos.flush();
-            }
-        } catch (Exception e) {
-            //先关闭外层的缓冲流，再关闭内层的流,但是在关闭外层流的同时，
-            //内层流也会自动的进行关闭，关于内层流的关闭，可以省略
-            e.printStackTrace();
-        } finally {
-            if (bis != null) {
-                bis.close();
-            }
-//            if (bos != null) {
-//                bos.close();
-//            }
-            if (connection != null) {
-                connection.disconnect();
-            }
-//            os.close();
-        }
-    }
 }

hazard-admin/src/main/java/com/ozs/web/controller/monitor/CameraUpdateLogController.java

@@ -8,9 +8,11 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraLogDetail;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.service.service.CameraLogDetailService;
 import com.ozs.service.service.CameraUpdateLogService;
 import com.ozs.system.service.ISysDictDataService;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.List;
@@ -44,6 +47,8 @@ public class CameraUpdateLogController extends BaseController {
     private CameraLogDetailService cameraLogDetailService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Resource
+    private BaseUserService baseUserService;
 
     /**
      * 获取相机升级日志分页列表
@@ -69,6 +74,8 @@ public class CameraUpdateLogController extends BaseController {
                 for (CameraUpdateLog li : list) {
                     if (li.getUpgradeType().equals(o.getUpgradeType())) {
                         o.setUpgradeTypeName(dictDataService.selectDictLabel("upgrade_type", String.valueOf(li.getUpgradeType())));
+                        BaseUser baseUser = baseUserService.getUser(o.getCreateBy());
+                        o.setCreateByName(baseUser.getUserName());
                     }
                 }
                 return o;