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

.idea/compiler.xml

@@ -13,9 +13,5 @@
         <module name="business-service" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="admin" target="1.8" />
-      <module name="hazard-stateSecrets" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
 </project>

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

@@ -69,4 +69,10 @@ public class CameraLogDetail implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
 }

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

@@ -43,4 +43,9 @@ public class CameraUpdateLogResp extends PageVo implements Serializable {
      */
     private Integer currentYear;
 
+    /**
+     * 关联升级日志id
+     */
+    private Long logId;
+
 }

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

@@ -7,6 +7,7 @@
         <result column="status" property="status"/>
         <result column="log_id" property="logId"/>
         <result column="update_time" property="updateTime"/>
+        <result column="remark" property="remark"/>
         <result column="lastVersionNum" property="lastVersionNum"/>
         <result column="currentVersionNum" property="currentVersionNum"/>
     </resultMap>
@@ -18,6 +19,7 @@
         a.status,
         a.log_id,
         a.update_time,
+        a.remark,
         b.version_num as currentVersionNum,
         b.last_version_num as lastVersionNum
         from camera_log_detail as a inner join

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

@@ -172,4 +172,13 @@ public class SysDictTypeController extends BaseController {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(dataType);
         return success(dictTypes);
     }
+
+    /**
+     * 获取字典类型名称
+     */
+    @PostMapping("/selectList")
+    public AjaxResult selectList() {
+        List<SysDictType> dictTypes = dictTypeService.list();
+        return success(dictTypes);
+    }
 }