生产管理已经加apiLog注解

hzims-biz-common/pom.xml

@@ -40,6 +40,7 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-datascope</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>

hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/IPUtils.java

@@ -0,0 +1,49 @@
+package com.hnac.hzims.common.utils;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/3/29 11:45
+ */
+public class IPUtils {
+
+	/**
+	 * 获取客户端ip地址
+	 * @param request
+	 * @return
+	 */
+	public static String getIpAddress(HttpServletRequest request) {
+
+		String sourceIp = null;
+
+		String ipAddresses = request.getHeader("x-forwarded-for");
+
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ipAddresses = request.getHeader("Proxy-Client-IP");
+		}
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ipAddresses = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ipAddresses = request.getHeader("HTTP_CLIENT_IP");
+		}
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ipAddresses = request.getHeader("HTTP_X_FORWARDED_FOR");
+		}
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ipAddresses = request.getRemoteAddr();
+		}
+		if (StringUtils.isEmpty(ipAddresses)) {
+			sourceIp = ipAddresses.split(",")[0];
+		}
+
+		return sourceIp;
+	}
+
+
+}

hzims-service-api/equipment-api/target/classes/META-INF/spring.factories

@@ -1,8 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.equipment.feign.IEmParamClientBack,\
   com.hnac.hzims.fdp.feign.QuestionClientFallback,\
-  com.hnac.hzims.equipment.feign.IEmInfoClientBack,\
   com.hnac.hzims.fdp.feign.IFdpTaskClientFallBack,\
+  com.hnac.hzims.equipment.feign.IEmInfoClientBack,\
   com.hnac.hzims.monitor.feign.IMonitorClientBack,\
   com.hnac.hzims.equipment.feign.IPlanGenertionClientBack,\
   com.hnac.hzims.equipment.feign.WorkshopInfoClientFallback,\

hzims-service-api/hzims-operational-api/target/classes/META-INF/spring.factories

@@ -4,10 +4,10 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.operational.duty.feign.IDutyClassClientFallback,\
   com.hnac.hzims.operational.defect.feign.IOperPhenomenonClientFallback,\
   com.hnac.hzims.operational.feign.OperTaskClientFallback,\
+  com.hnac.hzims.operational.duty.feign.IDutyGroupClientFallback,\
   com.hnac.hzims.operational.station.feign.IStationVideoTypeClientFallback,\
   com.hnac.hzims.operational.duty.feign.IDutyRecClientFalllback,\
   com.hnac.hzims.operational.access.feign.AccessTaskClientFallback,\
-  com.hnac.hzims.operational.duty.feign.IDutyGroupClientFallback,\
   com.hnac.hzims.operational.station.feign.IStationClientFallBack,\
   com.hnac.hzims.operational.duty.feign.IDutyMainClientFallback,\
   com.hnac.hzims.operational.defect.feign.Fallback.IOperDefectClientFallback
@@ -19,8 +19,8 @@ org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\
   com.hnac.hzims.operational.station.feign.IStationClient,\
   com.hnac.hzims.operational.duty.feign.IDutyMainClient,\
   com.hnac.hzims.operational.duty.feign.IDutyRecClient,\
-  com.hnac.hzims.operational.access.feign.IOperAccessTaskClient,\
   com.hnac.hzims.operational.feign.IMaintenanceTaskClient,\
+  com.hnac.hzims.operational.access.feign.IOperAccessTaskClient,\
   com.hnac.hzims.operational.duty.feign.IDutyGroupClient,\
   com.hnac.hzims.operational.station.feign.IStationVideoTypeClient,\
   com.hnac.hzims.operational.defect.feign.IOperPhenomenonClient,\

hzims-service-api/safeproduct-api/target/classes/META-INF/spring.factories

@@ -1,8 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.safeproduct.feign.SafeEquipmentTrialClientFallback,\
-  com.hnac.hzims.safeproduct.feign.SafeCheckClientFallback,\
   com.hnac.hzims.safeproduct.feign.IImsMonCameraInfoClientFallback,\
-  com.hnac.hzims.safeproduct.feign.IDangerSourceClientFallBack
+  com.hnac.hzims.safeproduct.feign.IDangerSourceClientFallBack,\
+  com.hnac.hzims.safeproduct.feign.SafeCheckClientFallback
 org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\
   com.hnac.hzims.safeproduct.feign.ISafeCheckClient,\
   com.hnac.hzims.safeproduct.feign.IImsMonCameraInfoClient,\

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -59,6 +60,7 @@ public class SpAllocationController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_allocation")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -46,6 +47,7 @@ public class SpReceiveController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receive")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java

@@ -13,6 +13,7 @@ import javax.validation.Valid;
 import org.springblade.core.boot.ctrl.BladeController;
 
 
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -49,6 +50,7 @@ public class SpReceivesController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receives")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -58,6 +59,7 @@ public class SpWarehouseInController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_warehouse_in")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -46,6 +47,7 @@ public class SpWarehouseOutController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_warehouse_out")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java

@@ -14,6 +14,7 @@ import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -92,6 +93,7 @@ public class WtSpBasicController extends BladeController {
 	/**
 	 * 基础信息分页列表
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_BASIC")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java

@@ -10,6 +10,7 @@ import com.hnac.hzims.spare.wrapper.WtSpManagementWrapper;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -70,6 +71,7 @@ public class WtSpManagementController extends BladeController {
 	 * @param managent
 	 * @return
 	 */
+	@ApiLog
 	@GetMapping("/lazy-list")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "code", value = "备品备件分类编码", paramType = "query", dataType = "string"),

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -52,6 +53,7 @@ public class WtSpProviderController extends BladeController {
      * 获取供应商列表
      * @return
      */
+	@ApiLog
     @GetMapping("/getProviderList")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取供应商列表")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -59,6 +60,7 @@ public class WtSpToolBasicController extends BladeController {
 	/**
 	 * 工具台账分页列表
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入toolBasicEntity")
@@ -71,7 +73,7 @@ public class WtSpToolBasicController extends BladeController {
 	 * 新增 代码自定义代号
 	 */
 	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
+	// @ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_TOOL_BASIC")
 	public R save(@Valid @RequestBody WtSpToolBasicEntity SP_TOOL_BASIC) {
 		return R.status(SP_TOOL_BASICService.save(SP_TOOL_BASIC));

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -61,6 +62,7 @@ public class WtSpTotalController extends BladeController {
 	/**
 	 * 库存分页列表
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入spToolVO")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -50,6 +51,7 @@ public class WtSpWarehouseController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
@@ -62,10 +64,12 @@ public class WtSpWarehouseController extends BladeController {
 	 * @param
 	 * @return
 	 */
+	@ApiLog
 	@GetMapping("/selectOptionList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "仓库列表(下拉框)")
-	public R<List<WtSpWarehouseEntity>> selectOptionList(Long deptId) {
+	public R<List<WtSpWarehouseEntity>>
+	selectOptionList(Long deptId) {
 		BladeUser user = AuthUtil.getUser();
 		if(null!=user){
 			List<WtSpWarehouseEntity> list = SP_WAREHOUSEService.selectOptionList(user.getTenantId(),deptId);

hzims-service/assets/target/classes/META-INF/spring.factories

@@ -1,8 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.spare.service.impl.StockAlertServiceImpl,\
   com.hnac.hzims.spare.service.impl.SpRevertServiceImpl,\
-  com.hnac.hzims.spare.service.impl.WtSpToolBasicServiceImpl,\
   com.hnac.hzims.spare.service.impl.WtSpManagementServiceImpl,\
+  com.hnac.hzims.spare.service.impl.WtSpToolBasicServiceImpl,\
   com.hnac.hzims.spare.controller.SpReceivesController,\
   com.hnac.hzims.spare.service.impl.WtSpBasicServiceImpl,\
   com.hnac.hzims.spare.service.impl.SpAllocationServiceImpl,\
@@ -17,8 +17,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.spare.controller.SpAllocationController,\
   com.hnac.hzims.spare.controller.WtSpBasicController,\
   com.hnac.hzims.spare.controller.SpReceiveController,\
-  com.hnac.hzims.spare.controller.WtSpManagementController,\
   com.hnac.hzims.spare.controller.WtSpWarehouseController,\
+  com.hnac.hzims.spare.controller.WtSpManagementController,\
   com.hnac.hzims.spare.feign.SpareClient,\
   com.hnac.hzims.spare.service.impl.SpWarehouseOutServiceImpl,\
   com.hnac.hzims.spare.service.impl.SpReceiveServiceImpl,\

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -76,6 +77,7 @@ public class EmInfoController extends BladeController {
 	/**
 	 * 设备列表 分页
 	 */
+	@ApiLog
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "设备分页", notes = "传入em_info")

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -45,6 +46,7 @@ public class PlanGenertionController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入entity")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apiguardian.api.API;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -55,6 +56,7 @@ public class WorkshopInfoController extends BladeController {
 		return R.success("更新成功");
 	}
 
+	@ApiLog
 	@RequestMapping(value = "/listPage",method = RequestMethod.GET)
 	@ApiOperation("列表分页查询")
 	@ApiOperationSupport(order = 3)

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -95,6 +96,7 @@ public class FdpFaultController extends BladeController {
 	 * @param query
 	 * @return
 	 */
+	@ApiLog
 	@GetMapping("/queryFaultListOrd")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "分页 查询参数:name,fdpId,emId,detectability,severity,fdpDeviceId,fdpDeviceName")

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

@@ -21,6 +21,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -144,6 +145,7 @@ public class FdpMonitorController extends BladeController {
 	/**
 	 * 查询列表树
 	 */
+	@ApiLog
 	@GetMapping("/listPage")
 	@ApiOperationSupport(order = 110)
 	@ApiOperation(value = "查询监测点列表")

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -84,6 +85,7 @@ public class FdpTaskController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction")

hzims-service/equipment/target/classes/META-INF/spring.factories

@@ -31,27 +31,27 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.equipment.feign.WorkshopInfoClient,\
   com.hnac.hzims.monitor.controller.EquipmentInstanceController,\
   com.hnac.hzims.equipment.service.impl.BladexUpdateDataServiceImpl,\
-  com.hnac.hzims.monitor.server.impl.EquipmentInstanceServiceImpl,\
   com.hnac.hzims.equipment.controller.EmAssociationController,\
+  com.hnac.hzims.monitor.server.impl.EquipmentInstanceServiceImpl,\
   com.hnac.hzims.equipment.controller.EmInfoController,\
   com.hnac.hzims.fdp.controller.FdpTaskController,\
   com.hnac.hzims.monitor.controller.EquipmentLedgerController,\
   com.hnac.hzims.fdp.proxy.impl.DiagnoseProxyImpl,\
   com.hnac.hzims.equipment.feign.EmParamClient,\
-  com.hnac.hzims.fdp.controller.FdpFaultInfoController,\
   com.hnac.hzims.equipment.service.impl.EmOreanizationServiceImpl,\
+  com.hnac.hzims.fdp.controller.FdpFaultInfoController,\
   com.hnac.hzims.equipment.controller.EmParamController,\
   com.hnac.hzims.equipment.feign.PlanGenertionClient,\
   com.hnac.hzims.equipment.service.impl.MessageUpdateDeptIdServiceImpl,\
-  com.hnac.hzims.equipment.controller.EmVideoController,\
   com.hnac.hzims.equipment.scheduled.EmDeviceCreateTask,\
-  com.hnac.hzims.fdp.scheduled.ThreadTask,\
+  com.hnac.hzims.equipment.controller.EmVideoController,\
   com.hnac.hzims.fdp.feign.FdpTaskClient,\
+  com.hnac.hzims.fdp.scheduled.ThreadTask,\
   com.hnac.hzims.fdp.controller.ModelController,\
-  com.hnac.hzims.equipment.service.impl.EquipmentUpdateDeptIdServiceImpl,\
   com.hnac.hzims.monitor.feign.MonitorClient,\
-  com.hnac.hzims.equipment.service.impl.EmAttachServiceImpl,\
+  com.hnac.hzims.equipment.service.impl.EquipmentUpdateDeptIdServiceImpl,\
   com.hnac.hzims.equipment.service.impl.EmModelParamServiceImpl,\
+  com.hnac.hzims.equipment.service.impl.EmAttachServiceImpl,\
   com.hnac.hzims.monitor.server.impl.ModelServiceImpl,\
   com.hnac.hzims.fdp.service.impl.FdpMonitorServiceImpl,\
   com.hnac.hzims.equipment.task.ScheduledTask,\
@@ -62,8 +62,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.monitor.service.impl.ModelInstanceServiceImpl,\
   com.hnac.hzims.fdp.controller.FdpDiagnoseController,\
   com.hnac.hzims.equipment.controller.EmAttachController,\
-  com.hnac.hzims.monitor.server.impl.RealTimeDataServerImpl,\
   com.hnac.hzims.equipment.service.impl.WorkshopInfoServiceImpl,\
+  com.hnac.hzims.monitor.server.impl.RealTimeDataServerImpl,\
   com.hnac.hzims.fdp.service.impl.FdpQuestionServiceImpl,\
   com.hnac.hzims.equipment.service.impl.DutyUpdateDeptIdServiceImpl,\
   com.hnac.hzims.fdp.service.impl.FdpFaultServiceImpl,\

hzims-service/message/target/classes/META-INF/spring.factories

@@ -1,8 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.hnac.hzims.message.service.impl.MsgPushRecordServiceImpl,\
   com.hnac.hzims.message.controller.MsgWsRecordHistoryController,\
   com.hnac.hzims.message.web.MsgPushRecordController,\
   com.hnac.hzims.message.fegin.MessageSmsClient,\
-  com.hnac.hzims.message.service.impl.MsgPushRecordServiceImpl,\
   com.hnac.hzims.message.web.TestWsController,\
   com.hnac.hzims.message.configure.controller.MailConfigController,\
   com.hnac.hzims.message.service.impl.MailMessageServiceImpl,\
@@ -11,18 +11,18 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.message.statistics.controller.MsgPushStatisticController,\
   com.hnac.hzims.message.web.MsgWsRecordController,\
   com.hnac.hzims.message.statistics.service.impl.MsgPushStatisticServiceImpl,\
-  com.hnac.hzims.message.service.impl.PushMessageServiceImpl,\
   com.hnac.hzims.message.schedule.MessagePushSchedule,\
+  com.hnac.hzims.message.service.impl.PushMessageServiceImpl,\
   com.hnac.hzims.message.service.SmsService,\
   com.hnac.hzims.message.service.PushService,\
   com.hnac.hzims.message.web.MsgSmsRecordController,\
   com.hnac.hzims.message.service.impl.MsgWsRecordServiceImpl,\
   com.hnac.hzims.message.service.impl.WebsocketServiceImpl,\
   com.hnac.hzims.message.service.impl.MsgSmsRecordServiceImpl,\
-  com.hnac.hzims.message.config.MailHealthIndicator,\
   com.hnac.hzims.message.configure.service.impl.SmsConfigServiceImpl,\
-  com.hnac.hzims.message.configure.feign.MessageConfigClient,\
+  com.hnac.hzims.message.config.MailHealthIndicator,\
   com.hnac.hzims.message.config.WebSocketConfig,\
+  com.hnac.hzims.message.configure.feign.MessageConfigClient,\
   com.hnac.hzims.message.push.service.impl.AppPushServiceImpl,\
   com.hnac.hzims.message.log.aspect.LogAspect,\
   com.hnac.hzims.message.fegin.MessagePushClient,\
@@ -30,16 +30,16 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.hnac.hzims.message.config.ThreadPoolConfig,\
   com.hnac.hzims.message.log.service.impl.SmsLogServiceImpl,\
   com.hnac.hzims.message.configure.controller.SmsConfigController,\
-  com.hnac.hzims.message.service.impl.MsgMailRecordServiceImpl,\
   com.hnac.hzims.message.service.impl.MsgWsRecordHistoryServiceImpl,\
+  com.hnac.hzims.message.service.impl.MsgMailRecordServiceImpl,\
   com.hnac.hzims.message.MessageApplication,\
   com.hnac.hzims.message.push.feign.PushMsgClient,\
-  com.hnac.hzims.message.log.service.impl.AppLogServiceImpl,\
   com.hnac.hzims.message.configure.service.impl.PushConfigServiceImpl,\
-  com.hnac.hzims.message.push.service.impl.SmsPushServiceImpl,\
-  com.hnac.hzims.message.configure.service.impl.WsConfigServiceImpl,\
-  com.hnac.hzims.message.push.service.impl.MailPushServiceImpl,\
+  com.hnac.hzims.message.log.service.impl.AppLogServiceImpl,\
   com.hnac.hzims.message.service.impl.PushMessagesServiceImpl,\
+  com.hnac.hzims.message.push.service.impl.MailPushServiceImpl,\
+  com.hnac.hzims.message.configure.service.impl.WsConfigServiceImpl,\
+  com.hnac.hzims.message.push.service.impl.SmsPushServiceImpl,\
   com.hnac.hzims.message.configure.service.impl.MailConfigServiceImpl,\
   com.hnac.hzims.message.controller.MessageController,\
   com.hnac.hzims.message.fegin.MessageClient,\

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -65,6 +66,7 @@ public class OperAccessBaseMaterialController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -75,6 +77,7 @@ public class OperAccessBaseMaterialController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:typeCode,name,model,unit")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -64,6 +65,7 @@ public class OperAccessContentController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -74,6 +76,7 @@ public class OperAccessContentController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:name,emCode,gradeCode,manager")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -64,6 +65,7 @@ public class OperAccessContentDetailController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -74,6 +76,7 @@ public class OperAccessContentDetailController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:contentId")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -66,6 +67,7 @@ public class OperAccessLibraryController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -76,6 +78,7 @@ public class OperAccessLibraryController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:emCode,gradeCode")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -64,6 +65,7 @@ public class OperAccessLibraryDetailController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -74,6 +76,7 @@ public class OperAccessLibraryDetailController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:pid,name")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -64,6 +65,7 @@ public class OperAccessMaterialController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -74,6 +76,7 @@ public class OperAccessMaterialController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:materialId,planId")

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -96,6 +97,7 @@ public class OperAccessPlanController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -116,6 +118,7 @@ public class OperAccessPlanController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status")
@@ -123,6 +126,7 @@ public class OperAccessPlanController extends BladeController {
 		return service.list(req, query);
 	}
 
+
 	@GetMapping("/getMaterialsByTaskId")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "查询任务材料列表")
@@ -130,7 +134,7 @@ public class OperAccessPlanController extends BladeController {
 		return service.getMaterialsByTaskId(taskId);
 	}
 
-//	@GetMapping("/getUserByDept")
+	//	@GetMapping("/getUserByDept")
 //	@ApiOperationSupport(order = 70)
 //	@ApiOperation(value = "根据创建机构获取人员列表")
 //	public R getUserByDept(@RequestParam("createDept") @ApiParam(value = "创建机构",required = true) Long createDept,
@@ -156,20 +160,20 @@ public class OperAccessPlanController extends BladeController {
 //		}
 //		return R.data(userList);
 //	}
-
+	@ApiLog
 	@GetMapping("/getUserByRoleAlias")
 	@ApiOperationSupport(order = 80)
 	@ApiOperation(value = "根据角色别称获取人员列表")
-	public R getUserByRoleAlias(@RequestParam("roleAlias") @ApiParam(value = "角色别称",required = true) String roleAlias,
-		@RequestParam("createDept") @ApiParam(value = "创建机构",required = true) Long createDept) {
+	public R getUserByRoleAlias(@RequestParam("roleAlias") @ApiParam(value = "角色别称", required = true) String roleAlias,
+								@RequestParam("createDept") @ApiParam(value = "创建机构", required = true) Long createDept) {
 		IUserClient userClient = SpringUtil.getBean(IUserClient.class);
-		return userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(),createDept,roleAlias);
+		return userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), createDept, roleAlias);
 	}
 
 	@PostMapping("/billing")
 	@ApiOperationSupport(order = 90)
 	@ApiOperation(value = "检修计划开票")
 	public R billing(OperAccessPlanEntity entity, WorkTicketTemplateEntity templateEntity) {
-		return service.billing(entity,templateEntity);
+		return service.billing(entity, templateEntity);
 	}
 }

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -65,7 +66,7 @@ public class OperAccessStatisticsController extends BladeController {
 
 	/**
 	 * 详情
-	 */
+	 // */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -76,6 +77,7 @@ public class OperAccessStatisticsController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:pid,taskId,manager")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -65,6 +66,7 @@ public class OperAccessTaskController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -75,6 +77,7 @@ public class OperAccessTaskController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -74,6 +75,7 @@ public class OperAccessTaskDetailController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:taskId,name")

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -33,6 +34,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 统计通讯中断时间
 	 */
+	@ApiLog
 	@GetMapping("/statisticsTime")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "统计通讯中断时间", notes = "传入imsDutyMainEntity")
@@ -44,6 +46,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 统计通讯中断二级目录查询
 	 */
+	@ApiLog
 	@GetMapping("/queryByEntity")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "统计通讯中断二级目录查询", notes = "传入imsDutyMainEntity")
@@ -52,6 +55,7 @@ public class AbnormalAlarmController extends BladeController {
 		return R.data(pages);
 	}
 
+	@ApiLog
 	@GetMapping("/queryStationName")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询站点")
@@ -62,6 +66,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "详情", notes = "传入HistoryAbnormalAlarmEntity")
@@ -73,6 +78,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "传入HistoryAbnormalAlarmEntity")
@@ -105,6 +111,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 *
 	 */
+	@ApiLog
 	@ApiOperation(value = "智能优化接口")
 	@ApiOperationSupport(order = 7)
 	@RequestMapping(value = "/alarms", method = {RequestMethod.GET, RequestMethod.POST})
@@ -115,6 +122,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 智能告警数量: 时间范围当天
 	 */
+	@ApiLog
 	@ApiOperation(value = "智能告警数量")
 	@ApiOperationSupport(order = 8)
 	@RequestMapping(value = "/count", method = {RequestMethod.GET, RequestMethod.POST})
@@ -126,6 +134,7 @@ public class AbnormalAlarmController extends BladeController {
 	/**
 	 * 智能告警数据: 时间范围当天
 	 */
+	@ApiLog
 	@ApiOperation(value = "智能告警数据")
 	@ApiOperationSupport(order = 9)
 	@RequestMapping(value = "/data", method = RequestMethod.GET)

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.user.entity.User;
@@ -44,6 +45,7 @@ public class AlarmHandleController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入AlarmHandleEntity")
@@ -55,6 +57,7 @@ public class AlarmHandleController extends BladeController {
 	/**
 	 * 告警处理用户查询
 	 */
+	@ApiLog
 	@GetMapping("/handleUser")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "告警通知人", notes = "告警通知人")

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

@@ -6,6 +6,7 @@ import com.hnac.hzims.operational.census.vo.WaterFlowVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +26,7 @@ public class CensusController {
 
 	private final CensusService service;
 
+	@ApiLog
 	@ApiOperation("水位-流量统计")
 	@PostMapping("/water-flow")
 	@ApiOperationSupport(order = 1)

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -43,6 +44,8 @@ public class TargetController {
 		return R.data(service.electricGeneration(stationName,type));
 	}
 
+
+	@ApiLog
 	@ApiOperation("计划发电量/实际发电量统计:区分填报/接入站点")
 	@PostMapping("/complete-generation")
 	@ApiOperationSupport(order = 3)
@@ -50,6 +53,8 @@ public class TargetController {
 		return R.data(service.completeGeneration(stationName,type));
 	}
 
+
+	@ApiLog
 	@ApiOperation("两票统计:区分填报/平台业务数据")
 	@PostMapping("/complete-ticket")
 	@ApiOperationSupport(order = 4)
@@ -57,6 +62,7 @@ public class TargetController {
 		return R.data(service.completeTicket(areaName,type));
 	}
 
+	@ApiLog
 	@ApiOperation("缺陷率统计:区分填报/平台业务数据")
 	@GetMapping("/complete-defect")
 	@ApiOperationSupport(order = 5)
@@ -64,6 +70,8 @@ public class TargetController {
 		return  R.data(service.defect(areaName,type));
 	}
 
+
+	@ApiLog
 	@ApiOperation("上线率/Fa投入条数统计")
 	@GetMapping("/complete-other")
 	@ApiOperationSupport(order = 6)
@@ -71,6 +79,7 @@ public class TargetController {
 		return  R.data(service.completeOther(stationName,type,queryType));
 	}
 
+	@ApiLog
 	@ApiOperation("日常维护统计")
 	@GetMapping("/routine-maintenance")
 	@ApiOperationSupport(order = 7)
@@ -78,6 +87,8 @@ public class TargetController {
 		return service.routineMaintenance(params,query,type);
 	}
 
+
+	@ApiLog
 	@ApiOperation("检修任务统计")
 	@GetMapping("/examine-repair")
 	@ApiOperationSupport(order = 8)
@@ -85,6 +96,8 @@ public class TargetController {
 		return service.examineRepair(params, query,type);
 	}
 
+
+	@ApiLog
 	@ApiOperation("检修卡统计")
 	@GetMapping("/examineCard")
 	@ApiOperationSupport(order = 9)
@@ -92,6 +105,7 @@ public class TargetController {
 		return R.data(service.examineCard(stationName,type));
 	}
 
+	@ApiLog
 	@ApiOperation("设备统计")
 	@GetMapping("/device-classify")
 	@ApiOperationSupport(order = 10)
@@ -99,6 +113,8 @@ public class TargetController {
 		return R.data(service.deviceClassify(stationName,deptId,status));
 	}
 
+
+	@ApiLog
 	@ApiOperation("水电集团、区域指标关联")
 	@GetMapping("/hydropower-target")
 	@ApiOperationSupport(order = 10)
@@ -107,6 +123,7 @@ public class TargetController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("水利集团、区域指标关联")
 	@GetMapping("/water-target")
 	@ApiOperationSupport(order = 10)
@@ -114,6 +131,7 @@ public class TargetController {
 		return R.data(service.waterTarget(stationName,deptId,target));
 	}
 
+	@ApiLog
 	@ApiOperation("集团设备统计")
 	@GetMapping("/device-group")
 	@ApiOperationSupport(order = 11)
@@ -122,6 +140,7 @@ public class TargetController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("集团操作票/工作票")
 	@GetMapping("/ticket-group")
 	@ApiOperationSupport(order = 12)

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

@@ -5,6 +5,7 @@ import com.hnac.hzims.operational.data.service.HzimsDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +26,7 @@ public class HzimsDataController {
 	/**
 	 * 获取区域列表数据
 	 */
+	@ApiLog
 	@GetMapping("/saveArea")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取区域列表数据", notes = "无需传入参数")
@@ -35,6 +37,7 @@ public class HzimsDataController {
 	/**
 	 * 获取区域列表数据
 	 */
+	@ApiLog
 	@GetMapping("/saveStation")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取站点统计数据", notes = "无需传入参数")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.flow.core.vo.ComleteTask;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +34,7 @@ public class DefectCheckController extends BladeController {
 	 * @param phenomenon
 	 * @return
 	 */
+	@ApiLog
 	@PostMapping("/startCheck")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "保存现象、开启缺陷处理流程", notes = "现象对象")

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -55,6 +56,7 @@ public class OperDefectController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入defect")
@@ -144,6 +146,7 @@ public class OperDefectController extends BladeController {
 	/**
 	 * 获取缺陷的统计月报
 	 */
+	@ApiLog
 	@GetMapping("/getDefectStatistics")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "获取缺陷的统计月报", notes = " month 格式：2021-01")

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -59,6 +60,7 @@ public class OperDefectStatisticsController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入statistics")
@@ -90,6 +92,7 @@ public class OperDefectStatisticsController extends BladeController {
 	/**
 	 * 获取设备缺陷统计数据
 	 */
+	@ApiLog
 	@GetMapping("/getEMStaticstic")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取设备缺陷统计数据", notes = "传入statistics")

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -37,6 +38,7 @@ public class OperFaultController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入fault")
@@ -49,6 +51,7 @@ public class OperFaultController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入fault")

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -46,6 +47,7 @@ public class OperPhenomenonController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入phenomenon")
@@ -58,6 +60,7 @@ public class OperPhenomenonController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入phenomenon")

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

@@ -9,6 +9,7 @@ import com.hnac.hzims.operational.duty.vo.StationDutyGroupGenerationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -37,6 +38,7 @@ public class DutyGroupGeneratingCapacityController extends BladeController {
 	/**
 	 * 查询分页数据
 	 */
+	@ApiLog
 	@ApiOperation(value = "查询分页数据")
 	@RequestMapping(value = "/list")
 	@ApiOperationSupport(order = 20)
@@ -49,6 +51,7 @@ public class DutyGroupGeneratingCapacityController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperation(value = "详情")
 	@ApiOperationSupport(order = 30)

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -43,6 +44,7 @@ public class ImsDutyChangeController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入dutyChange")
@@ -62,6 +64,7 @@ public class ImsDutyChangeController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail/test")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情示例", notes = "传入dutyChange")
@@ -74,6 +77,7 @@ public class ImsDutyChangeController extends BladeController {
 	 *
 	 * @param businessId 主键
 	 */
+	@ApiLog
 	@GetMapping("/detailById")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入 主键Id")
@@ -85,6 +89,7 @@ public class ImsDutyChangeController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入dutyChange")
@@ -146,6 +151,8 @@ public class ImsDutyChangeController extends BladeController {
 		return R.status(imsDutyService.completeTask(flow,changeEntity));
 	}
 
+
+	@ApiLog
 	@PostMapping("/getList")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "查询调班记录", notes = "")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -37,6 +38,7 @@ public class ImsDutyClassController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入imsDutyClass")
@@ -48,6 +50,7 @@ public class ImsDutyClassController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyClass")
@@ -63,6 +66,7 @@ public class ImsDutyClassController extends BladeController {
 	/**
 	 * 查询所有班次列表(不分页)
 	 */
+	@ApiLog
 	@GetMapping("/getlist")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "列表(不分页)", notes = "传入imsDutyClass")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -48,6 +49,7 @@ public class ImsDutyClassTypeController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyClassType")
@@ -64,6 +66,7 @@ public class ImsDutyClassTypeController extends BladeController {
 	/**
 	 * 获取所有班次类型 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/listClassType")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取所有班次类型")
@@ -100,6 +103,7 @@ public class ImsDutyClassTypeController extends BladeController {
 	/**
 	 * 获取不存在班次中的班次类型
 	 */
+	@ApiLog
 	@GetMapping("/classTypeList")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "获取不存在班次中的班次类型", notes = "传入ids")

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -40,6 +41,7 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 班组详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "班组详情", notes = "传入imsDutyGroup")
@@ -51,6 +53,7 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyGroup")
@@ -139,6 +142,7 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 人员分组查询
 	 */
+	@ApiLog
 	@PostMapping("/personGroupAll")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "人员分组查询", notes = "传入imsDutyGroup")
@@ -160,6 +164,7 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 *查询所有班组  负责人 is not null
 	 */
+	@ApiLog
 	@GetMapping("/list-manager")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询所有班组(已有负责人的班组)", notes = "传入imsDutyGroup")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -49,6 +50,7 @@ public class ImsDutyMainController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyMain")
@@ -61,6 +63,7 @@ public class ImsDutyMainController extends BladeController {
 	/**
 	 * 根据时间查询所有值班信息列表(不分页)
 	 */
+	@ApiLog
 	@GetMapping("/getList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表(不分页)", notes = "传入imsDutyMain")
@@ -106,6 +109,7 @@ public class ImsDutyMainController extends BladeController {
 	/**
 	 * 查询排班
 	 */
+	@ApiLog
 	@PostMapping("/scheduling/list")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "查询排班", notes = "传年份和月份  year   month")

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,7 @@ public class ImsDutyMainTemplateController  extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/listAll")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询  不分页", notes = "传入ImsDutyMainTemplateEntity")

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -46,6 +47,7 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入imsDutyRec")
@@ -58,6 +60,7 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyRec")
@@ -70,6 +73,7 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 自定义分页 附件表
 	 */
+	@ApiLog
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页--交接班记录", notes = "传入entity")
@@ -144,6 +148,7 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 指定当天班组为值班中
 	 */
+	@ApiLog
 	@GetMapping("/update")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "指定当天班组为值班中", notes = "传入entity")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -52,6 +53,7 @@ public class ImsDutyRecQRRecordController extends BladeController {
 	/**
 	 * 自定义分页 附件表
 	 */
+	@ApiLog
 	@PostMapping("/pageList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页--交接班扫码记录", notes = "传入vo")

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -55,6 +56,7 @@ public class NotInsertPowerController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -55,6 +56,7 @@ public class NotInsertUseController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -59,6 +60,7 @@ public class OtherController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -59,6 +60,7 @@ public class OverConfigController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：over_name")
@@ -69,6 +71,7 @@ public class OverConfigController extends BladeController {
 	/**
 	 * 获取排序号
 	 */
+	@ApiLog
 	@PostMapping("/getSort")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "获取排序号")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -60,6 +61,7 @@ public class OverController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +30,7 @@ public class OverDetailsController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：over_id")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -59,6 +60,7 @@ public class PowerController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")

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

@@ -2,6 +2,7 @@ package com.hnac.hzims.operational.fill.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.operational.fill.vo.RainfallVo;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.operational.fill.entity.RainfallEntity;
@@ -54,6 +55,7 @@ public class RainfallController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -59,6 +60,7 @@ public class SolveController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：startDate,endDate,createDept")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -51,6 +52,7 @@ public class StorageController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "查询条件：startTime,endTime,stationCode")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +27,9 @@ public class AppHomeController extends BladeController {
 
 	private final IAppHomeService appService;
 
+
+
+	@ApiLog
 	@ApiOperation("app首页-站点")
 	@GetMapping("/appStation")
 	@ApiOperationSupport(order = 11)
@@ -33,6 +37,7 @@ public class AppHomeController extends BladeController {
 		return R.data(appService.appStation(deptId));
 	}
 
+	@ApiLog
 	@ApiOperation("app首页-站点列表数据")
 	@GetMapping("/appStationList")
 	@ApiOperationSupport(order = 11)
@@ -40,6 +45,7 @@ public class AppHomeController extends BladeController {
 		return R.data(appService.appStationList(deptId));
 	}
 
+	@ApiLog
 	@ApiOperation("app首页-当班数据")
 	@GetMapping("/getDutyData")
 	@ApiOperationSupport(order = 11)

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +31,7 @@ public class AreaMonthReportController extends BladeController {
 	@NotNull
 	private final IAreaMonthReportService service;
 
+	@ApiLog
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("生成区域月报")
 	@GetMapping("/loadMonthReport")
@@ -38,6 +40,7 @@ public class AreaMonthReportController extends BladeController {
 		return R.success("success");
 	}
 
+	@ApiLog
 	@ApiOperationSupport(order = 2)
 	@ApiOperation("获取区域月报")
 	@GetMapping("/getAreaMonthReport")
@@ -45,6 +48,7 @@ public class AreaMonthReportController extends BladeController {
 		return service.getReport(date);
 	}
 
+	@ApiLog
 	@ApiOperationSupport(order = 3)
 	@ApiOperation("导出区域月报")
 	@GetMapping("/exportAreaMonthReport")

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +26,7 @@ public class FlawPhenomenonController extends BladeController {
 	/**
 	 * 获取设备缺陷统计数据
 	 */
+	@ApiLog
 	@GetMapping("/getTheDayFlawCount")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取当天缺陷统计", notes = "传入date")
@@ -36,6 +38,7 @@ public class FlawPhenomenonController extends BladeController {
 	/**
 	 * 获取设备缺陷统计数据
 	 */
+	@ApiLog
 	@GetMapping("/getTheDayDefectCount")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "获取当天缺陷统计-首页(改)", notes = "传入date")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +27,7 @@ public class HydropowerController extends BladeController {
 	@NotNull
 	private final IHomePageService homePageService;
 
+	@ApiLog
 	@ApiOperation("服务厂站统计")
 	@GetMapping("/stationCensus")
 	@ApiOperationSupport(order = 1)
@@ -34,6 +36,7 @@ public class HydropowerController extends BladeController {
 		return R.data(stationList);
 	}
 
+	@ApiLog
 	@ApiOperation("关键指标:水电站、风电站、光伏站")
 	@GetMapping("/powerStation")
 	@ApiOperationSupport(order = 2)
@@ -42,6 +45,7 @@ public class HydropowerController extends BladeController {
 		return R.data(powerTargetVoList);
 	}
 
+	@ApiLog
 	@ApiOperation("关键指标:储能站、水利")
 	@GetMapping("/storageConservancy")
 	@ApiOperationSupport(order = 3)
@@ -50,6 +54,7 @@ public class HydropowerController extends BladeController {
 		return R.data(crucialTargetVoList);
 	}
 
+	@ApiLog
 	@ApiOperation("关键指标:暂定其他站")
 	@GetMapping("/waterAffairs")
 	@ApiOperationSupport(order = 4)
@@ -58,6 +63,7 @@ public class HydropowerController extends BladeController {
 		return R.data(waterAffairsVoList);
 	}
 
+	@ApiLog
 	@ApiOperation("水电站数据获取")
 	@GetMapping("/getHydropowerData")
 	@ApiOperationSupport(order = 5)
@@ -67,6 +73,7 @@ public class HydropowerController extends BladeController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("年计划发电完成趋势")
 	@GetMapping("/planAactualTrend")
 	@ApiOperationSupport(order = 6)
@@ -74,6 +81,10 @@ public class HydropowerController extends BladeController {
 		return R.data(homePageService.planActualTrend(deptId));
 	}
 
+
+
+
+	@ApiLog
 	@ApiOperation("计划发电趋势")
 	@GetMapping("/planGenerationTrend")
 	@ApiOperationSupport(order = 7)
@@ -81,6 +92,7 @@ public class HydropowerController extends BladeController {
 		return homePageService.planGenerationTrend(deptId, 0, 2);
 	}
 
+	@ApiLog
 	@ApiOperation("区域发电占比")
 	@GetMapping("/areaGenerationMakeUp")
 	@ApiOperationSupport(order = 9)
@@ -89,6 +101,7 @@ public class HydropowerController extends BladeController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("统计")
 	@GetMapping("/getCount")
 	@ApiOperationSupport(order = 10)
@@ -97,6 +110,7 @@ public class HydropowerController extends BladeController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("获取区域")
 	@GetMapping("/getArea")
 	@ApiOperationSupport(order = 11)
@@ -105,6 +119,7 @@ public class HydropowerController extends BladeController {
 	}
 
 
+	@ApiLog
 	@ApiOperation("站点首页")
 	@GetMapping("/stationHome")
 	@ApiOperationSupport(order = 11)

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

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -51,6 +52,9 @@ public class MainReportController extends BladeController {
 	private final IOperMaintenanceTaskService maintenanceTaskService;
 	private final IOperAccessTaskService accessTaskService;
 
+
+
+	@ApiLog
 	@ApiOperationSupport(order = 10)
 	@ApiOperation("缺陷报表")
 	@GetMapping("/defect")
@@ -89,6 +93,7 @@ public class MainReportController extends BladeController {
 		return R.data(data);
 	}
 
+	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("运维报表(日常维护、巡检、检修)")
 	@GetMapping("/operational")

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

@@ -6,6 +6,7 @@ import com.hnac.hzims.operational.main.vo.EmStatisticsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import com.hnac.hzims.operational.main.service.IMainStatisticsService;
 import com.hnac.hzims.operational.main.vo.DutyStatisticsVO;
@@ -24,6 +25,7 @@ public class MainStatisticsController {
 	@Autowired
 	private IMainStatisticsService mainStatisticsService;
 
+	@ApiLog
 	@ApiOperationSupport(order = 10)
 	@ApiOperation("获取运维统计值班统计")
 	@GetMapping("/getDutyStatistics")
@@ -32,6 +34,7 @@ public class MainStatisticsController {
 		return R.data(DutyStatisticsVO);
 	}
 
+	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取运维统计设备统计")
 	@GetMapping("/getEmStatistics")
@@ -40,6 +43,7 @@ public class MainStatisticsController {
 		return R.data(emStatisticsVO);
 	}
 
+	@ApiLog
 	@ApiOperationSupport(order = 30)
 	@ApiOperation("获取运维板块统计")
 	@GetMapping("/getOperationStatistics")

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

@@ -7,6 +7,7 @@ import com.hnac.hzims.operational.station.entity.StationEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +34,7 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
 	@PostMapping("/getHisDataByDept")
@@ -47,6 +49,7 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）")
 	@PostMapping("/getHisDataByDeptNew")
@@ -60,6 +63,7 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("获取折线图")
 	@PostMapping("/getTheDayHydrographNew")
@@ -99,6 +103,8 @@ public class MainSystemMonitoringController {
 	 *
 	 * @return
 	 */
+	//todo 机构
+	@ApiLog
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("机构")
 	@GetMapping("/dept/list")
@@ -107,6 +113,7 @@ public class MainSystemMonitoringController {
 
 	}
 
+	@ApiLog
 	@GetMapping("/listByAuth")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限查询站点", notes = "")
@@ -114,6 +121,7 @@ public class MainSystemMonitoringController {
 		return R.data(mainSystemMonitoringService.doListByAuth(entity));
 	}
 
+	@ApiLog
 	@GetMapping("/listByAuthDept")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限查询站点及部门", notes = "")
@@ -121,7 +129,7 @@ public class MainSystemMonitoringController {
 		return R.data(mainSystemMonitoringService.doListByAuthDept());
 	}
 
-
+	@ApiLog
 	@GetMapping("/deptByAuthUser")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限获取机构", notes = "")

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,14 +26,14 @@ import java.util.Map;
 public class MainTaskStatisticController extends BladeController {
 
 	private final IMainTaskStatisticService statisticService;
-
+	@ApiLog
 	@RequestMapping(value = "/getMainTaskMonthCount",method = {RequestMethod.POST,RequestMethod.GET})
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("首页当月任务执行情况")
 	public R<List<MainTaskStatisticDTO>> getMainTaskMonthCount() {
 		return statisticService.getMainTaskMonthCount();
 	}
-
+	@ApiLog
 	@RequestMapping(value = "/getCurrentDutyTicketCount",method = {RequestMethod.POST,RequestMethod.GET})
 	@ApiOperationSupport(order = 2)
 	@ApiOperation("首页当班票据统计")

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -34,6 +35,7 @@ public class MainWorkBenchController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "分页", notes = "传入StationEntity")
@@ -79,6 +81,7 @@ public class MainWorkBenchController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("获取路由")
 	@PostMapping("/getHomePageWorkBench")

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
@@ -47,20 +48,18 @@ public class PVAppMainController extends BladeController {
 		return R.data(null);
 	}
 
-//	@GetMapping("/setRealDataByRealId")
+	//	@GetMapping("/setRealDataByRealId")
 //	public R<Boolean> setRealDataByRealId() {
 //		String realData  = "";
 //		redisTemplate.opsForValue().set(redisKeyConstants.getRealDataByRealId(),realData);
 //		return R.success("保存成功");
 //	}
-
+	@ApiLog
 	@GetMapping("/getDeptDataByUser")
 	@ApiOperation("获取用户光伏电站首页")
 	@ApiOperationSupport(order = 2)
 	public R<List<DeptRealDataVO>> getDeptDataByUser() {
-		List<StationEntity> stationEntityList = stationService.list(
-			Wrappers.<StationEntity>lambdaQuery().eq(StationEntity::getType, HomePageConstant.PHOTOVOLTAIC)
-		);
+		List<StationEntity> stationEntityList = stationService.list(Wrappers.<StationEntity>lambdaQuery().eq(StationEntity::getType, HomePageConstant.PHOTOVOLTAIC));
 		List<DeptRealDataVO> result = stationEntityList.stream().map(stationEntity -> pvAppMainService.getDeptData(stationEntity)).collect(Collectors.toList());
 		return R.data(result);
 	}

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,14 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
 public class PhotovoltaicController extends BladeController {
 
 	private final PhotovoltaicService service;
-
+	@ApiLog
 	@ApiOperation("集团/区域关键指标")
 	@GetMapping("/KPIs")
 	@ApiOperationSupport(order = 1)
 	public R KPIs(@ApiParam(value = "集团/区域机构编号") Long deptId) {
 		return R.data(service.KPIs(deptId));
 	}
-
+	@ApiLog
 	@ApiOperation("集团/区域发电量")
 	@GetMapping("/generation")
 	@ApiOperationSupport(order = 2)
@@ -39,7 +40,7 @@ public class PhotovoltaicController extends BladeController {
 						@ApiParam(value = "查询类型:0-周 1-月 -2年") String type) {
 		return R.data(service.generation(deptId,type));
 	}
-
+	@ApiLog
 	@ApiOperation("集团/区域下属数据占比")
 	@GetMapping("/subordinate")
 	@ApiOperationSupport(order = 3)

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +30,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("站点统计")
 	@GetMapping("/stationCount")
@@ -41,6 +43,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 2)
 	@ApiOperation("云服务-关键指标")
 	@GetMapping("/cloud-key-index")
@@ -53,6 +56,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 3)
 	@ApiOperation("云服务-告警信息")
 	@GetMapping("/cloud-alarm-info")
@@ -65,6 +69,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 4)
 	@ApiOperation("云服务-月告警排名")
 	@GetMapping("/cloud-alarm-ranking")
@@ -77,6 +82,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 5)
 	@ApiOperation("云服务-运行数据排名")
 	@GetMapping("/cloud-run-data-ranking")
@@ -90,6 +96,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 6)
 	@ApiOperation("代运维-值班情况")
 	@GetMapping("/with-operations-duty-situation")
@@ -103,6 +110,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 7)
 	@ApiOperation("代运维-任务情况")
 	@GetMapping("/with-operations-task-situation")
@@ -115,6 +123,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 8)
 	@ApiOperation("代运维-关键指标")
 	@GetMapping("/with-operations-key-index")
@@ -128,6 +137,7 @@ public class PlatformController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 9)
 	@ApiOperation("代运维-告警信息")
 	@GetMapping("/with-operations-alarm-info")

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

@@ -23,6 +23,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -57,6 +58,7 @@ public class RunMonthReportController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("根据站点获取运行月报--旧版")
 	@GetMapping("/getByStation")
@@ -230,6 +232,7 @@ public class RunMonthReportController extends BladeController {
 	 *
 	 * @return
 	 */
+	@ApiLog
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("根据站点获取运行月报-新版")
 	@GetMapping("/new/getByStation")

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,21 +19,21 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "扫一扫", tags = "二维码扫一扫")
 public class ScanController {
 	private final IScanService scanService;
-
+	@ApiLog
 	@GetMapping("/getData")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取数据（消缺单、检修、日常维护等）", notes = "")
 	public R<ScanDto> getData(@ApiParam("设备编码") String emCode){
 		return R.data(scanService.getData(emCode));
 	}
-
+	@ApiLog
 	@GetMapping("/getRealDataTimeAndDeviceFile")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "获取实时数据及设备档案）", notes = "")
 	public R<ScanDto> getRealDataTimeAndDeviceFile(@ApiParam("设备编码") String emCode){
 		return R.data(scanService.getRealDataTimeAndDeviceFile(emCode));
 	}
-
+	@ApiLog
 	@GetMapping("/getBusinessRecords")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取业务档案）", notes = "")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +27,7 @@ public class SideHustleController extends BladeController {
 	@NotNull
 	private final ISideHustleService regionService;
 
-
+	@ApiLog
 	@ApiOperation("区域值班信息统计")
 	@GetMapping("/areaDutyInfoCount")
 	@ApiOperationSupport(order = 1)
@@ -34,7 +35,7 @@ public class SideHustleController extends BladeController {
 		List<AreaDutyVo> dutyInfoCountVoList = regionService.areaDutyInfoCount(deptId);
 		return R.data(dutyInfoCountVoList);
 	}
-
+	@ApiLog
 	@ApiOperation("集团/区域站点设备统计")
 	@GetMapping("/equipmentStateCount")
 	@ApiOperationSupport(order = 2)
@@ -42,21 +43,21 @@ public class SideHustleController extends BladeController {
 		List<EquipmentStateCountVo> equipmentCountVoList = regionService.equipmentStateCount(deptId);
 		return R.data(equipmentCountVoList);
 	}
-
+	@ApiLog
 	@ApiOperation("集团/区域发电占比")
 	@GetMapping("/areaPowerScale")
 	@ApiOperationSupport(order = 3)
 	public R<List<AreaPowerScaleVo>> areaPowerScale(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(regionService.areaPowerScale(deptId));
 	}
-
+	@ApiLog
 	@ApiOperation("集团/区域占比")
 	@GetMapping("/areaScale")
 	@ApiOperationSupport(order = 4)
 	public R<List<AreaScaleVo>> areaScale(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(regionService.areaScale(deptId));
 	}
-
+	@ApiLog
 	@ApiOperation("集团当月发电量完成情况")
 	@GetMapping("/areaPowerMonth")
 	@ApiOperationSupport(order = 5)
@@ -64,14 +65,14 @@ public class SideHustleController extends BladeController {
 		List<PowerFinishVo> powerFinishVoList = regionService.areaPowerMonth(deptId);
 		return R.data(powerFinishVoList);
 	}
-
+	@ApiLog
 	@ApiOperation("获取地图标记")
 	@GetMapping("/getMapMarker")
 	@ApiOperationSupport(order = 6)
 	public R<List<MapMarkerVo>> getMapMarker(@ApiParam(value = "区域机构ID") Long deptId,@RequestParam(value ="types") List<Integer> types) {
 		return R.data(regionService.getMapMarker(deptId,types));
 	}
-
+	@ApiLog
 	@ApiOperation("区域当月发电量完成情况")
 	@GetMapping("/powerFinishMonth")
 	@ApiOperationSupport(order = 7)

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +24,7 @@ public class TaskRealTimeCountController extends BladeController {
 	/**
 	 * 获取任务实时数据统计
 	 */
+	@ApiLog
 	@GetMapping("/getRealTimeDataCount")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取任务实时数据统计", notes = "")

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

@@ -7,6 +7,7 @@ import com.hnac.hzims.operational.main.service.IUnitRunningTimeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -33,6 +34,7 @@ public class UnitRunningTimeController extends BladeController {
     /**
      * 查询分页数据
      */
+	@ApiLog
     @ApiOperation(value = "查询分页数据")
     @RequestMapping(value = "/list")
     public R<IPage<UnitRunningTimeEntity>> list(UnitRunningTimeEntity entity, Query query){
@@ -44,6 +46,7 @@ public class UnitRunningTimeController extends BladeController {
   /**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
     @ApiOperation(value = "详情")
     public R<UnitRunningTimeEntity> detail(UnitRunningTimeEntity entity){

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -89,6 +90,7 @@ public class UserFeedbackController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情", notes = "传入id")
@@ -100,6 +102,7 @@ public class UserFeedbackController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页", notes = "查询条件：startTime,endTime,content,createUser,status")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +26,7 @@ public class WaterHomeController extends BladeController {
 	@NotNull
 	private final IWaterService service;
 
+	@ApiLog
 	@ApiOperation("水利指标")
 	@GetMapping("/waterConservancy")
 	@ApiOperationSupport(order = 1)
@@ -33,6 +35,7 @@ public class WaterHomeController extends BladeController {
 		return R.data(response);
 	}
 
+	@ApiLog
 	@ApiOperation("水利区域/站点详情")
 	@GetMapping("/waterDetails")
 	@ApiOperationSupport(order = 2)
@@ -41,6 +44,7 @@ public class WaterHomeController extends BladeController {
 		return R.data(list);
 	}
 
+	@ApiLog
 	@ApiOperation("水利用电排行")
 	@GetMapping("/waterUseEleRanking")
 	@ApiOperationSupport(order = 3)
@@ -49,6 +53,7 @@ public class WaterHomeController extends BladeController {
 		return R.data(list);
 	}
 
+	@ApiLog
 	@ApiOperation("水利近年数据对比：用电量")
 	@GetMapping("/waterYearCompare")
 	@ApiOperationSupport(order = 4)
@@ -65,6 +70,7 @@ public class WaterHomeController extends BladeController {
 		return R.data(list);
 	}
 
+	@ApiLog
 	@ApiOperation("水利站点首页")
 	@GetMapping("/waterStationPage")
 	@ApiOperationSupport(order = 6)
@@ -72,7 +78,7 @@ public class WaterHomeController extends BladeController {
 		WaterStationVo response = service.waterStationPage(deptId);
 		return R.data(response);
 	}
-
+	@ApiLog
 	@ApiOperation("泵组列表")
 	@GetMapping("/getPumpList")
 	@ApiOperationSupport(order = 7)
@@ -80,7 +86,7 @@ public class WaterHomeController extends BladeController {
 		List<WaterPumpVo> list = service.getPumpList(deptId);
 		return R.data(list);
 	}
-
+	@ApiLog
 	@ApiOperation("闸门列表")
 	@GetMapping("/getGateList")
 	@ApiOperationSupport(order = 8)

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +24,7 @@ import java.util.List;
 public class WebHomeController extends BladeController {
 
 	private final IWebHomeService service;
-
+	@ApiLog
 	@ApiOperation("水电站站点统计")
 	@GetMapping("/webStation")
 	@ApiOperationSupport(order = 1)
@@ -31,7 +32,7 @@ public class WebHomeController extends BladeController {
 		HydropowerStationVo response = service.webStation(deptId);
 		return R.data(response);
 	}
-
+	@ApiLog
 	@ApiOperation("水电站机组列表")
 	@GetMapping("/getPumpList")
 	@ApiOperationSupport(order = 2)
@@ -39,6 +40,7 @@ public class WebHomeController extends BladeController {
 		List<HydropowerUnitVo> list = service.hydropowerDevice(deptId);
 		return R.data(list);
 	}
+	@ApiLog
 
 	@ApiOperation("水电站站点列表")
 	@GetMapping("/webStationList")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -80,6 +81,7 @@ public class OperMaintenanceLibraryController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)")
@@ -87,6 +89,7 @@ public class OperMaintenanceLibraryController extends BladeController {
 		return libraryService.list(req, query);
 	}
 
+	@ApiLog
 	@GetMapping("/generatePlan")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "生成日常维护任务")

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,6 +34,7 @@ public class OperMaintenanceMonitorController extends BladeController {
 	/**
 	 * 监控月报表
 	 */
+	@ApiLog
 	@GetMapping("/report/month")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "监控月报表")

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -64,6 +65,7 @@ public class OperMaintenanceParameterController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -74,6 +76,7 @@ public class OperMaintenanceParameterController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:emCode,typeCode,refLibraryId,disposer")

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -73,6 +74,7 @@ public class OperMaintenancePlanController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -83,6 +85,7 @@ public class OperMaintenancePlanController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:refLibraryId,disposer")
@@ -91,7 +94,7 @@ public class OperMaintenancePlanController extends BladeController {
 	public R<IPage<OperMaintenancePlanVO>> list(OperMaintenancePlanDTO req, Query query) {
 		return planService.list(req, query);
 	}
-
+	@ApiLog
 	@GetMapping("/generateTask")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "根据计划ID生成任务")

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -83,6 +84,7 @@ public class OperMaintenanceTaskController extends BladeController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "详情")
@@ -93,6 +95,7 @@ public class OperMaintenanceTaskController extends BladeController {
 	/**
 	 * 分页
 	 */
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status")
@@ -102,6 +105,7 @@ public class OperMaintenanceTaskController extends BladeController {
 		return taskService.list(req, query);
 	}
 
+
 	@GetMapping("/testCreateTask")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "测试定时生成日常维护任务")
@@ -132,7 +136,7 @@ public class OperMaintenanceTaskController extends BladeController {
 		ComleteTask completeTask = JSON.parseObject(JSON.toJSONString(requestMap.get("completeTask")), ComleteTask.class);
 		return taskService.completeTask(req,completeTask);
 	}
-
+	@ApiLog
 	@PostMapping("/deleteTaskBatch")
 	@ApiOperationSupport(order = 90)
 	@ApiOperation(value = "删除日常维护工作流任务")

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

@@ -4,6 +4,7 @@ import com.hnac.hzims.operational.report.service.IDeptService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,13 +20,13 @@ import java.util.List;
 @RequestMapping("/dept")
 public class DeptController extends BladeController {
 	private final IDeptService deptService;
-
+	@ApiLog
 	@RequestMapping("/getDeptLeafNode")
 	public R getDeptLeafNode(){
 		return R.data(deptService.getDeptList());
 	}
 
-
+	@ApiLog
 	@GetMapping("/getCurrentUserDept")
 	public R<List<Dept>> getCurrentUserDept(@RequestParam(required = false) String name,@RequestParam(required = false) String type){
 		return R.data(deptService.getCurrentUserDept(name,type));

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jdk.nashorn.internal.objects.annotations.Getter;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.entity.Dept;
@@ -55,6 +56,7 @@ public class MonthReportController {
 		return R.success("执行完成");
 	}
 
+	@ApiLog
 	@GetMapping("/getStationMonthReportByStationCode")
 	@ApiOperation(value = "根据站点编码获取站点月报",notes = "根据站点编码获取站点月报")
 	@ApiOperationSupport(order = 1)
@@ -66,6 +68,7 @@ public class MonthReportController {
 		return R.data(stationReportAllVO);
 	}
 
+	@ApiLog
 	@GetMapping("/getPersonalMonthReport")
 	@ApiOperation(value = "获取当前登录人个人月报",notes = "获取当前登录人个人月报")
 	@ApiOperationSupport(order = 2)

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -49,7 +50,7 @@ public class MainPageConfController {
 	public R<Boolean> remove (@RequestParam @ApiParam("主键ID，按逗号分隔") String ids) {
 		return R.status(mainPageConfService.removeByIds(Func.toLongList(",",ids)));
 	}
-
+	@ApiLog
 	@GetMapping("/listPage")
 	@ApiOperation("分页查询大屏首页配置")
 	@ApiOperationSupport(order = 3)
@@ -66,7 +67,7 @@ public class MainPageConfController {
 		});
 		return R.status(mainPageConfService.updateById(req));
 	}
-
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperation("更新大屏首页配置查询")
 	@ApiOperationSupport(order = 5)

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import javafx.beans.binding.BooleanBinding;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -30,14 +31,14 @@ public class ControlUsersController extends BladeController {
 	public R<Boolean> save(@RequestBody ControlUsersEntity req) {
 		return R.status(controlUsersService.save(req));
 	}
-
+	@ApiLog
 	@GetMapping("/listPage")
 	@ApiOperation("分页查询")
 	@ApiOperationSupport(order = 2)
 	public R<IPage<ControlUsersEntity>> listPage(ControlUsersEntity req, Query query) {
 		return R.data(controlUsersService.listPage(req,query));
 	}
-
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperation("查看详情")
 	@ApiOperationSupport(order = 3)

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

@@ -9,6 +9,7 @@ import com.hnac.hzims.operational.station.service.IHzimsAnalyzeModelStationServi
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -24,49 +25,51 @@ import java.util.List;
 
 /**
  * <p>
-    * 分析模型站点 前端控制器
-    * </p>
+ * 分析模型站点 前端控制器
+ * </p>
  *
  * @author lx
- * @since 2021-09-28
  * @version v1.0
+ * @since 2021-09-28
  */
 @Api(tags = {"分析模型站点"})
 @RestController
 @RequestMapping("/analyze/model/station")
 public class HzimsAnalyzeModelStationController extends BladeController {
-    @Autowired
-    private IHzimsAnalyzeModelStationService analyzeModelStationService;
+	@Autowired
+	private IHzimsAnalyzeModelStationService analyzeModelStationService;
 
-    /**
-     * 查询分页数据
-     */
-    @ApiOperation(value = "查询分页数据")
-    @GetMapping(value = "/list")
-    public R<IPage<HzimsAnalyzeModelStationEntity>> list(HzimsAnalyzeModelStationEntity entity, Query query){
-        IPage<HzimsAnalyzeModelStationEntity> page = analyzeModelStationService.page(Condition.getPage(query), Condition.getQueryWrapper(entity));
-        return R.data(page);
-    }
+	/**
+	 * 查询分页数据
+	 */
+	@ApiLog
+	@ApiOperation(value = "查询分页数据")
+	@GetMapping(value = "/list")
+	public R<IPage<HzimsAnalyzeModelStationEntity>> list(HzimsAnalyzeModelStationEntity entity, Query query) {
+		IPage<HzimsAnalyzeModelStationEntity> page = analyzeModelStationService.page(Condition.getPage(query), Condition.getQueryWrapper(entity));
+		return R.data(page);
+	}
 
 
-  /**
+	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
-    @ApiOperation(value = "详情")
-    public R<HzimsAnalyzeModelStationEntity> detail(HzimsAnalyzeModelStationEntity entity){
-        HzimsAnalyzeModelStationEntity hzimsAnalyzeModelStationEntity = analyzeModelStationService.getOne(Condition.getQueryWrapper(entity));
-       return R.data(hzimsAnalyzeModelStationEntity);
-    }
+	@ApiOperation(value = "详情")
+	public R<HzimsAnalyzeModelStationEntity> detail(HzimsAnalyzeModelStationEntity entity) {
+		HzimsAnalyzeModelStationEntity hzimsAnalyzeModelStationEntity = analyzeModelStationService.getOne(Condition.getQueryWrapper(entity));
+		return R.data(hzimsAnalyzeModelStationEntity);
+	}
 
-    /**
-     * 新增或修改
-     */
-    @ApiOperation(value = "新增或修改")
-    @PostMapping("/submit")
-    public R submit(@Valid @RequestBody HzimsAnalyzeModelStationEntity entity){
-    	if(null == entity.getId()){
-    		entity.setInstanceCode("sta_"+new Date().getTime());
+	/**
+	 * 新增或修改
+	 */
+	@ApiOperation(value = "新增或修改")
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody HzimsAnalyzeModelStationEntity entity) {
+		if (null == entity.getId()) {
+			entity.setInstanceCode("sta_" + new Date().getTime());
 		}
 		List<HzimsAnalyzeModelStationEntity> classEntity = analyzeModelStationService.list(new LambdaQueryWrapper<HzimsAnalyzeModelStationEntity>() {{
 			eq(HzimsAnalyzeModelStationEntity::getStationId, entity.getStationId());
@@ -77,17 +80,17 @@ public class HzimsAnalyzeModelStationController extends BladeController {
 		if (CollectionUtil.isNotEmpty(classEntity)) {
 			return R.fail("站点已存在");
 		}
-        return R.data(analyzeModelStationService.saveOrUpdate(entity));
-    }
+		return R.data(analyzeModelStationService.saveOrUpdate(entity));
+	}
 
 
-    /**
-     * 逻辑删除
-     */
-    @ApiOperation(value = "逻辑删除")
-    @PostMapping(value = "/remove")
-    public R remove(@RequestParam("ids") String ids){
-        return  R.data(analyzeModelStationService.removeByIds(Func.toLongList(ids)));
-    }
+	/**
+	 * 逻辑删除
+	 */
+	@ApiOperation(value = "逻辑删除")
+	@PostMapping(value = "/remove")
+	public R remove(@RequestParam("ids") String ids) {
+		return R.data(analyzeModelStationService.removeByIds(Func.toLongList(ids)));
+	}
 
 }

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

@@ -9,6 +9,7 @@ import com.hnac.hzims.operational.station.vo.DeptTreeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -39,6 +40,7 @@ public class ImsDeptController {
 	/**
 	 * 查询分页数据
 	 */
+	@ApiLog
 	@ApiOperation(value = "查询分页数据")
 	@RequestMapping(value = "/list")
 	public R<IPage<ImsDeptEntity>> list(ImsDeptEntity entity, Query query) {
@@ -50,6 +52,7 @@ public class ImsDeptController {
 	/**
 	 * 详情
 	 */
+	@ApiLog
 	@GetMapping("/detail")
 	@ApiOperation(value = "详情")
 	public R<ImsDeptEntity> detail(ImsDeptEntity entity) {
@@ -89,6 +92,7 @@ public class ImsDeptController {
 	/**
 	 * 获取站点机构树
 	 */
+	@ApiLog
 	@ApiOperation(value = "获取水电站机构树")
 	@GetMapping(value = "/getHydropowerTree")
 	public R<List<DeptTreeVo>> getHydropowerTree(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer stationType,@RequestParam(required = false) Integer serveType) {
@@ -101,6 +105,7 @@ public class ImsDeptController {
 	/**
 	 * 获取权限区域
 	 */
+	@ApiLog
 	@ApiOperation(value = "获取权限区域")
 	@GetMapping(value = "/getTypeArea")
 	public R<List<AreaTypeVo>> getTypeArea(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer typeArea,Long deptId) {

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -40,13 +41,13 @@ public class StationAttributeController extends BladeController {
 
 	private final IStationAttributeService stationAttributeService;
 	private final IStationAttrConfigService stationAttrConfigService;
-
+	@ApiLog
 	@GetMapping("/getMainList")
 	@ApiOperation("查詢某站点属性配置主页面")
 	public R<IPage> getMainList(StationAttributeDto attributeDto, Query query) {
 		return stationAttributeService.getMainList(attributeDto,query);
 	}
-
+	@ApiLog
 	@GetMapping("/listPage")
 	@ApiOperation("查詢屬性详情")
 	@ApiImplicitParams({

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -52,6 +53,7 @@ public class StationController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "分页", notes = "传入StationEntity")
@@ -59,7 +61,7 @@ public class StationController extends BladeController {
 		IPage<StationVO> vos = stationService.list(entity,query);
 		return R.data(vos);
 	}
-
+	@ApiLog
 	@GetMapping("/detail/{id}")
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "查看详情", notes = "查看详情")
@@ -70,6 +72,7 @@ public class StationController extends BladeController {
 	/**
 	 * 新增
 	 */
+	@ApiLog
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 20)
 	@ApiOperation(value = "新增")
@@ -151,6 +154,7 @@ public class StationController extends BladeController {
 		return R.data(stationService.getStationByCode(code));
 	}
 
+	@ApiLog
 	@GetMapping(value = "/getList")
 	@ApiOperationSupport(order = 70)
 	@ApiOperation(value = "获取站点列表（不分页查询）", notes = "传入StationEntity")
@@ -162,6 +166,7 @@ public class StationController extends BladeController {
 		return R.data(stationService.list(lwq));
 	}
 
+	@ApiLog
 	@GetMapping("/list/all")
 	@ApiOperationSupport(order = 80)
 	@ApiOperation(value = "查询所有", notes = "")
@@ -169,7 +174,7 @@ public class StationController extends BladeController {
 		return R.data(stationService.getAll());
 	}
 
-
+	@ApiLog
 	@GetMapping("/listByServeType")
 	@ApiOperationSupport(order = 90)
 	@ApiOperation(value = "根据服务类型查询站点", notes = "")
@@ -177,7 +182,7 @@ public class StationController extends BladeController {
 		return R.data(stationService.doListByServeType(serveType));
 	}
 
-
+	@ApiLog
 	@GetMapping("/listByType")
 	@ApiOperationSupport(order = 90)
 	@ApiOperation(value = "根据服务类型查询站点", notes = "")
@@ -194,7 +199,7 @@ public class StationController extends BladeController {
 		List<StationEntity> list = mainSystemMonitoringService.classifyUserDataScopeType(null, null, Func.toStrList(type));*/
 		return R.data(list);
 	}
-
+	@ApiLog
 	@GetMapping("/getHomeStationList")
 	@ApiOperationSupport(order = 91)
 	@ApiOperation(value = "获取首页站点列表", notes = "")
@@ -202,7 +207,7 @@ public class StationController extends BladeController {
 		return R.data(stationService.getHomeStationList(deptId,types,serveType));
 	}
 
-
+	@ApiLog
 	@GetMapping("/select")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "下拉站点列表", notes = "")

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -50,6 +51,7 @@ public class StationUserController extends BladeController {
 		return R.status(stationUserService.removeByIds(Func.toLongList(",",ids)));
 	}
 
+	@ApiLog
 	@GetMapping("/listPage")
 	@ApiOperation("分页")
 	@ApiOperationSupport(order = 4)
@@ -57,6 +59,7 @@ public class StationUserController extends BladeController {
 		return R.data(stationUserService.listPage(query,req));
 	}
 
+	@ApiLog
 	@GetMapping("/list")
 	@ApiOperation("查询列表")
 	@ApiOperationSupport(order = 5)

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

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -68,6 +69,7 @@ public class StationVideoTypeController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@ApiLog
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "分页", notes = "传入stationVideoType")
@@ -132,6 +134,7 @@ public class StationVideoTypeController extends BladeController {
 		return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	@ApiLog
 	@RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表")
@@ -140,65 +143,66 @@ public class StationVideoTypeController extends BladeController {
 		return R.data(result);
 	}
 
+	@ApiLog
 	@RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
 	public R<StationVideoTypeEntity> getById(@RequestParam Long id,@RequestParam int streamType){
 		return R.data(stationVideoTypeService.getById(id,streamType));
 	}
-
+	@ApiLog
 	@RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST})
 	public R<String> getHikVideo(){
 		return R.data(stationVideoTypeService.getHikVideo());
 	}
-
+	@ApiLog
 	@RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 70)
 	@ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点")
 	public R<List<StationEntity>> getStationsByVideo() {
 		return R.data(stationVideoTypeService.getStationsByVideo());
 	}
-
+	@ApiLog
 	@GetMapping("/getStationVideoOrderBySort")
 	@ApiOperationSupport(order = 80)
 	@ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表")
 	public R<IPage> getStationVideoOrderBySort(StationVideoTypeDTO stationVideoTypeDTO,Query query) {
 		return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO,query));
 	}
-
+	@ApiLog
 	@RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 90)
 	@ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址")
 	public R<List<StationVideoTypeEntity>> getVideoByIdsAndType(@RequestParam String ids, @RequestParam String type) {
 		return R.data(stationVideoTypeService.getVideoByIdsAndType(ids,type));
 	}
-
+	@ApiLog
 	@GetMapping("/getVideoByIds")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址")
 	public R<List<StationVideoTypeEntity>> getVideoByIds(@RequestParam String ids,@RequestParam String randomCode) {
 		return R.data(stationVideoTypeService.getVideoByIds(ids,randomCode));
 	}
-
+	@ApiLog
 	@RequestMapping(value = "/getVideoReviewerToken",method = {RequestMethod.GET, RequestMethod.POST})
 	public R<String> getVideoReviewerToken() {
 		return R.data(stationVideoTypeService.getVideoReviewerToken());
 	}
-
+	@ApiLog
 	@GetMapping("/getVideoMonitorByAgency")
 	@ApiOperationSupport(order = 110)
 	@ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频")
 	public R<List<VideoMonitorVO>> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) {
 		return R.data(stationVideoTypeService.getVideoMonitor(type));
 	}
-
+	@ApiLog
 	@GetMapping("/getHikVisionStations")
 	@ApiOperationSupport(order = 120)
 	@ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表")
 	public R<List<JSONObject>> getHikVisionStations() {
 		return R.data(stationVideoTypeService.getHikVisionStations());
 	}
-
+	@ApiLog
 	@GetMapping("/getMonitorsByStation")
 	@ApiOperationSupport(order = 130)
 	@ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点")