Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAttendanceController.java

@@ -4,6 +4,8 @@ package com.usky.fire.controller.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.PatrolInspectionAttendance;
 import com.usky.fire.service.PatrolInspectionAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,7 @@ public class PatrolInspectionAttendanceController {
      * @param patrolInspectionAttendance
      * @return
      */
+    @Log(title = " 签到、签退信息记录", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public ApiResult<Void> add(@RequestBody PatrolInspectionAttendance patrolInspectionAttendance){
         patrolInspectionAttendanceService.add(patrolInspectionAttendance);

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionContentController.java

@@ -94,6 +94,7 @@ public class PatrolInspectionContentController {
      * @return
      * @throws IOException
      */
+    @Log(title = "巡检内容", businessType = BusinessType.EXPORT)
     @PostMapping("/contentListExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "contentTitle", required = false) String contentTitle,

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionRecordController.java

@@ -3,6 +3,8 @@ package com.usky.fire.controller.web;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.PatrolInspectionRecord;
 import com.usky.fire.service.PatrolInspectionRecordService;
 import com.usky.fire.service.vo.PatrolInspectionRecordExportVo;
@@ -99,6 +101,7 @@ public class PatrolInspectionRecordController {
      * @param idList        记录ID
      * @throws IOException
      */
+    @Log(title = "巡检记录", businessType = BusinessType.EXPORT)
     @PostMapping("/recordLsitExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "areaName", required = false) String areaName,

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionSiteController.java

@@ -146,6 +146,7 @@ public class PatrolInspectionSiteController {
      * @param idList   地点ID
      * @return
      */
+    @Log(title = "巡检地点", businessType = BusinessType.EXPORT)
     @PostMapping("/patrolInspectionSiteListExport")
     public void export(HttpServletResponse response,
                        @RequestParam(required = false) Integer areaId,

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionTypeController.java

@@ -3,6 +3,8 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.PatrolInspectionType;
 import com.usky.fire.service.PatrolInspectionTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,7 @@ public class PatrolInspectionTypeController {
      * @param patrolInspectionType
      * @return
      */
+    @Log(title = "操作类型", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public ApiResult<Void> add(@RequestBody PatrolInspectionType patrolInspectionType){
         patrolInspectionTypeService.add(patrolInspectionType);
@@ -50,6 +53,7 @@ public class PatrolInspectionTypeController {
      * @param deleteType
      * @return
      */
+    @Log(title = "操作类型", businessType = BusinessType.DELETE)
     @GetMapping("/delete")
     public ApiResult<Void> delete(@RequestBody PatrolInspectionType deleteType){
         patrolInspectionTypeService.softDelete(deleteType);