Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java

@@ -63,9 +63,6 @@ public class WorkshopInfoController extends BladeController {
 	@RequestMapping(value = "/listPage",method = RequestMethod.GET)
 	@ApiOperation("列表分页查询")
 	@ApiOperationSupport(order = 3)
-	@OperationAnnotation(moduleName = "厂房管理",title = "厂房管理",operatorType = OperatorType.MOBILE,businessType =
-			BusinessType.GENCODE,
-			action = "列表分页查询")
 	public R<IPage> listPage(WorkshopInfoDTO req, Query query) {
 		return R.data(service.page(Condition.getPage(query),service.getLambdaQuery(req)));
 	}

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessTypeController.java

@@ -78,7 +78,6 @@ public class ProcessTypeController {
     }
 
 
-    @OperationAnnotation(title = "操作模块", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "获取redis数据")
     @GetMapping("/redis/{value}")
     public int opens(@PathVariable String value) {
         redisTemplate.convertAndSend("blade:queue:flow", JSON.toJSONString(value));
@@ -86,7 +85,7 @@ public class ProcessTypeController {
     }
 
 
-    @OperationAnnotation(title = "工作流审批类型", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "查询")
+
     @GetMapping("/list")
     public R list() {
         List<ProcessType> list = processTypeService.list();
@@ -95,7 +94,6 @@ public class ProcessTypeController {
     }
 
 
-    @OperationAnnotation(title = "工作流审批类型", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "审批流处理")
     @GetMapping("/build")
     public void addList() {
         ProcessWorkFlowResponse workTicketMessageResponse = new ProcessWorkFlowResponse();

hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java

@@ -102,8 +102,6 @@ public class MessagePushRecordController extends BladeController {
     @GetMapping("/getPersonalUnreadMessage")
     @ApiOperation("获取当前登录人待办消息")
     @ApiOperationSupport(order = 8)
-    @OperationAnnotation(moduleName = "视频集中监控", title = "视频集中监控", action = "获取当前登录人待办消息",
-            operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE)
     public R<List<UnreadMessageVO>> getPersonalUnreadMessage() {
         List<UnreadMessageVO> personalUnreadMessage = messagePushRecordService.getPersonalUnreadMessage();
         return R.data(personalUnreadMessage);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecQRRecordController.java

@@ -57,8 +57,6 @@ public class ImsDutyRecQRRecordController extends BladeController {
 	 */
 	@PostMapping("/pageList")
 	@ApiOperationSupport(order = 3)
-	@OperationAnnotation(title = "签到记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
-			= "分页--交接班扫码记录")
 	@ApiOperation(value = "分页--交接班扫码记录", notes = "传入vo")
 	public R<IPage<ImsDutyRecQRRecordVo>> page(@Valid @RequestBody ImsDutyRecQRRecordVo vo, Query query) {
 		return R.data(recQRRecordService.doPageList(Condition.getPage(query), vo));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java

@@ -50,16 +50,12 @@ public class SideHustleController extends BladeController {
 	@ApiOperation("集团/区域发电占比")
 	@GetMapping("/areaPowerScale")
 	@ApiOperationSupport(order = 3)
-	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "区域发电占比")
 	public R<List<AreaPowerScaleVo>> areaPowerScale(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(regionService.areaPowerScale(deptId));
 	}
 	@ApiLog
 	@ApiOperation("集团/区域占比")
 	@GetMapping("/areaScale")
-	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "区域占比")
 	@ApiOperationSupport(order = 4)
 	public R<List<OldAreaScaleVo>> areaScale(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(regionService.areaScale(deptId));
@@ -77,8 +73,6 @@ public class SideHustleController extends BladeController {
 	@ApiOperation("获取地图标记")
 	@GetMapping("/getMapMarker")
 	@ApiOperationSupport(order = 6)
-	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "获取地图标记")
 	public R<List<MapMarkerVo>> getMapMarker(@ApiParam(value = "区域机构ID") Long deptId,@RequestParam(value ="types") List<Integer> types) {
 		return R.data(regionService.getMapMarker(deptId,types));
 	}