修改安全安全管理日志注解

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java

@@ -45,7 +45,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 @Slf4j
 @AllArgsConstructor
 @RequestMapping("/accident")
-@Api(value = "事故管理",tags = "事故管理")
+@Api(value = "事故管理", tags = "事故管理")
 public class AccidentController extends BladeController {
 
     private final IAccidentService accidentService;
@@ -58,7 +58,7 @@ public class AccidentController extends BladeController {
     @ApiOperation("事故管理保存")
     @ApiOperationSupport(order = 1)
     public R save(@RequestBody @Valid AccidentDTO req) {
-		AccidentEntity accidentEntity = BeanUtil.copy(req,AccidentEntity.class);
+        AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class);
         accidentService.save(accidentEntity);
         return R.data(accidentEntity);
     }
@@ -69,16 +69,14 @@ public class AccidentController extends BladeController {
     public R<AccidentVO> detail(@PathVariable(value = "id") Long id) {
         AccidentVO accidentVO = null;
         readLock.lock();
-		try{
+        try {
             AccidentEntity accidentEntity = accidentService.getById(id);
-			if( ObjectUtil.isNotEmpty(accidentEntity)) {
+            if (ObjectUtil.isNotEmpty(accidentEntity)) {
                 accidentVO = AccidentWrapper.build().entityVO(accidentEntity);
             }
-		}
+        } catch (Exception e) {
-		catch(Exception e){
             e.printStackTrace();
-		}
+        } finally {
-		finally {
             readLock.unlock();
         }
         return R.data(accidentVO);
@@ -88,16 +86,14 @@ public class AccidentController extends BladeController {
     @ApiOperation("根据ID修改事故")
     @ApiOperationSupport(order = 3)
     @Transactional(rollbackFor = Exception.class)
-	public R updateById (@RequestBody @Valid AccidentDTO req) {
+    public R updateById(@RequestBody @Valid AccidentDTO req) {
         writeLock.lock();
-		try{
+        try {
-			AccidentEntity accidentEntity = BeanUtil.copy(req,AccidentEntity.class);
+            AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class);
             accidentService.updateById(accidentEntity);
-		}
+        } catch (Exception e) {
-		catch(Exception e) {
             e.printStackTrace();
-		}
+        } finally {
-		finally {
             writeLock.unlock();
         }
         return R.success("操作成功");
@@ -116,16 +112,16 @@ public class AccidentController extends BladeController {
     @ApiOperation("分页查询")
     @ApiOperationSupport(order = 5)
     @OperationAnnotation(moduleName = "安全管理",
-			title = "事故管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+            title = "事故管理", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
-			action = "分页条件")
+            action = "分页查询事故管理列表")
-	public R<IPage> pageList(AccidentDTO req, Query query){
+    public R<IPage> pageList(AccidentDTO req, Query query) {
-		AccidentEntity accidentEntity = BeanUtil.copy(req,AccidentEntity.class);
+        AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class);
-		LambdaQueryWrapper<AccidentEntity> queryWrapper = Condition.getQueryWrapper(new AccidentEntity(),accidentEntity);
+        LambdaQueryWrapper<AccidentEntity> queryWrapper = Condition.getQueryWrapper(new AccidentEntity(), accidentEntity);
-		if(ObjectUtil.isNotEmpty(req.getStatus())){
+        if (ObjectUtil.isNotEmpty(req.getStatus())) {
-			queryWrapper.eq(AccidentEntity::getStatus,req.getStatus());
+            queryWrapper.eq(AccidentEntity::getStatus, req.getStatus());
         }
-		IPage page = accidentService.page(Condition.getPage(query),queryWrapper);
+        IPage page = accidentService.page(Condition.getPage(query), queryWrapper);
-		if(CollectionUtil.isNotEmpty(page.getRecords())){
+        if (CollectionUtil.isNotEmpty(page.getRecords())) {
             page.setRecords(AccidentWrapper.build().listVO(page.getRecords()));
         }
         return R.data(page);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java

@@ -103,7 +103,7 @@ public class CheckMonthController extends BladeController {
 	@ApiOperation(value = "分页", notes = "查询条件：month,status,createDept")
 	@OperationAnnotation(moduleName = "安全管理",
 			title = "月度自查核查",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
-			action = "分页")
+			action = "分页查询月度自查核查数据")
 	public R<IPage<CheckMonthVo>> listNotDataScope(CheckMonthEntity req, Query query) {
 		R<IPage<CheckMonthVo>> pageR = checkMonthlyService.pageNotDataScope(req, query);
 		IPage<CheckMonthVo> page = pageR.getData();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java

@@ -85,7 +85,7 @@ public class DangerSourceController extends BladeController {
 	@ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type")
 	@OperationAnnotation(moduleName = "安全管理",title = "危险点列表",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页")
+			action = "分页查询危险点列表列表")
 	public R<IPage<DangerSourceVO>> list(DangerSourceEntity req, Query query) {
 		return dangerSourceService.pageCondition(req, query);
 	}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java

@@ -81,7 +81,7 @@ public class EmergencyPlanController extends BladeController {
 	@ApiOperationSupport(order = 50)
 	@OperationAnnotation(moduleName = "安全管理",title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页条件")
+			action = "分页查询应急预案文件列表")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,fileStatus,fileName")
 	public R<IPage<EmergencyPlanVO>> list(EmergencyPlanListDTO req, Query query) {
 		return emergencyPlanService.pageCondition(req, query);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java

@@ -99,7 +99,7 @@ public class SafetyToolController extends BladeController {
 	@ApiOperationSupport(order = 50)
 	@OperationAnnotation(moduleName = "安全管理",title = "安全工具器",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页条件")
+			action = "分页查询安全工具器列表")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,toolName,toolCode")
 	public R<IPage<SafetyToolVO>> list(SafetyToolDTO req, Query query) {
 		return safetyToolService.pageCondition(req, query);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java

@@ -98,7 +98,7 @@ public class SafetyToolTypeController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 60)
 	@OperationAnnotation(moduleName = "安全管理",title = "安全工器具类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
-			action = "分页条件")
+			action = "分页查询安全工器具类型数据")
 	@ApiOperation(value = "分页", notes = "查询条件：sendType,name,startSendTime,endSendTime")
 	public R<IPage<SafetyToolTypeVO>> list(SafetyToolTypeListDTO req, Query query) {
 		return R.data(safetyToolTypeService.pageCondition(req, query));

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java

@@ -87,7 +87,7 @@ public class SystemFileController extends BladeController {
 	@ApiOperation(value = "分页", notes = "查询条件：fTypeId,fileStatus,fileName")
 	@OperationAnnotation(moduleName = "安全管理",title = "体系文件",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页条件")
+			action = "分页查询体系文件数据")
 	public R<IPage<SystemFileVO>> list(SystemFileListDTO req, Query query) {
 		return systemFileService.pageCondition(req, query);
 	}