From 2b8b880868b3a0309de3ac462f82ac59e275fac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com>
Date: Thu, 30 Mar 2023 13:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E5=B7=B2?=
=?UTF-8?q?=E7=BB=8F=E5=8A=A0apiLog=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hzims-biz-common/pom.xml | 1 +
.../java/com/hnac/hzims/common/utils/IPUtils.java | 49 +
.../target/classes/META-INF/spring.factories | 2 +-
.../target/classes/META-INF/spring.factories | 4 +-
.../target/classes/META-INF/spring.factories | 4 +-
.../spare/controller/SpAllocationController.java | 2 +
.../spare/controller/SpReceiveController.java | 2 +
.../spare/controller/SpReceivesController.java | 2 +
.../spare/controller/SpWarehouseInController.java | 2 +
.../spare/controller/SpWarehouseOutController.java | 2 +
.../spare/controller/WtSpBasicController.java | 2 +
.../spare/controller/WtSpManagementController.java | 2 +
.../spare/controller/WtSpProviderController.java | 2 +
.../spare/controller/WtSpToolBasicController.java | 4 +-
.../spare/controller/WtSpTotalController.java | 2 +
.../spare/controller/WtSpWarehouseController.java | 6 +-
.../target/classes/META-INF/spring.factories | 4 +-
.../equipment/controller/EmInfoController.java | 2 +
.../controller/PlanGenertionController.java | 2 +
.../controller/WorkshopInfoController.java | 2 +
.../hzims/fdp/controller/FdpFaultController.java | 2 +
.../hzims/fdp/controller/FdpMonitorController.java | 2 +
.../hzims/fdp/controller/FdpTaskController.java | 2 +
.../target/classes/META-INF/spring.factories | 14 +-
.../equipment/service/impl/EmInfoServiceImpl.class | Bin 30694 -> 30686 bytes
.../target/classes/META-INF/spring.factories | 18 +-
.../OperAccessBaseMaterialController.java | 3 +
.../controller/OperAccessContentController.java | 3 +
.../OperAccessContentDetailController.java | 3 +
.../controller/OperAccessLibraryController.java | 3 +
.../OperAccessLibraryDetailController.java | 3 +
.../controller/OperAccessMaterialController.java | 3 +
.../controller/OperAccessPlanController.java | 16 +-
.../controller/OperAccessStatisticsController.java | 4 +-
.../controller/OperAccessTaskController.java | 3 +
.../controller/OperAccessTaskDetailController.java | 2 +
.../alert/controller/AbnormalAlarmController.java | 9 +
.../alert/controller/AlarmHandleController.java | 3 +
.../census/controller/CensusController.java | 2 +
.../census/controller/TargetController.java | 19 +
.../data/controller/HzimsDataController.java | 3 +
.../defect/controller/DefectCheckController.java | 2 +
.../defect/controller/OperDefectController.java | 3 +
.../controller/OperDefectStatisticsController.java | 3 +
.../defect/controller/OperFaultController.java | 3 +
.../controller/OperPhenomenonController.java | 3 +
.../DutyGroupGeneratingCapacityController.java | 3 +
.../duty/controller/ImsDutyChangeController.java | 7 +
.../duty/controller/ImsDutyClassController.java | 4 +
.../controller/ImsDutyClassTypeController.java | 4 +
.../duty/controller/ImsDutyGroupController.java | 5 +
.../duty/controller/ImsDutyMainController.java | 4 +
.../controller/ImsDutyMainTemplateController.java | 2 +
.../duty/controller/ImsDutyRecController.java | 5 +
.../controller/ImsDutyRecQRRecordController.java | 2 +
.../fill/controller/NotInsertPowerController.java | 2 +
.../fill/controller/NotInsertUseController.java | 2 +
.../fill/controller/OtherController.java | 2 +
.../fill/controller/OverConfigController.java | 3 +
.../fill/controller/OverController.java | 2 +
.../fill/controller/OverDetailsController.java | 2 +
.../fill/controller/PowerController.java | 2 +
.../fill/controller/RainfallController.java | 2 +
.../fill/controller/SolveController.java | 2 +
.../fill/controller/StorageController.java | 2 +
.../main/controller/AppHomeController.java | 6 +
.../main/controller/AreaMonthReportController.java | 4 +
.../main/controller/FlawPhenomenonController.java | 3 +
.../main/controller/HydropowerController.java | 15 +
.../main/controller/MainReportController.java | 5 +
.../main/controller/MainStatisticsController.java | 4 +
.../controller/MainSystemMonitoringController.java | 10 +-
.../controller/MainTaskStatisticController.java | 5 +-
.../main/controller/MainWorkBenchController.java | 3 +
.../main/controller/PVAppMainController.java | 9 +-
.../main/controller/PhotovoltaicController.java | 7 +-
.../main/controller/PlatformController.java | 10 +
.../main/controller/RunMonthReportController.java | 3 +
.../main/controller/ScanController.java | 7 +-
.../main/controller/SideHustleController.java | 15 +-
.../controller/TaskRealTimeCountController.java | 2 +
.../main/controller/UnitRunningTimeController.java | 3 +
.../main/controller/UserFeedbackController.java | 3 +
.../main/controller/WaterHomeController.java | 10 +-
.../main/controller/WebHomeController.java | 6 +-
.../OperMaintenanceLibraryController.java | 3 +
.../OperMaintenanceMonitorController.java | 2 +
.../OperMaintenanceParameterController.java | 3 +
.../controller/OperMaintenancePlanController.java | 5 +-
.../controller/OperMaintenanceTaskController.java | 6 +-
.../report/controller/DeptController.java | 5 +-
.../report/controller/MonthReportController.java | 3 +
.../screen/controller/MainPageConfController.java | 5 +-
.../station/controller/ControlUsersController.java | 5 +-
.../HzimsAnalyzeModelStationController.java | 79 +-
.../station/controller/ImsDeptController.java | 5 +
.../controller/StationAttributeController.java | 5 +-
.../station/controller/StationController.java | 15 +-
.../station/controller/StationUserController.java | 3 +
.../controller/StationVideoTypeController.java | 22 +-
.../version/controller/AppVersionController.java | 3 +
.../target/classes/META-INF/spring.factories | 38 +-
.../access/feign/OperAccessTaskClient.class | Bin 20284 -> 20284 bytes
.../alert/controller/AbnormalAlarmController.class | Bin 7305 -> 7906 bytes
.../operational/alert/mapper/AlarmHandleMapper.xml | 9 +-
.../service/HistoryAbnormalAlarmService.class | Bin 2437 -> 2578 bytes
.../service/impl/AbnormalAlarmServiceImpl.class | Bin 13310 -> 13496 bytes
.../service/impl/AlarmHandleServiceImpl.class | Bin 7658 -> 7717 bytes
.../impl/HistoryAbnormalAlarmServiceImpl.class | Bin 25414 -> 29093 bytes
.../census/service/impl/TargetServiceImpl.class | Bin 61514 -> 61526 bytes
.../service/impl/CentralMonitorServiceImpl.class | Bin 5091 -> 5083 bytes
.../impl/StFocusPropertiesServiceImpl$1.class | Bin 976 -> 976 bytes
.../impl/StFocusPropertiesServiceImpl$2.class | Bin 3226 -> 3226 bytes
.../impl/StFocusPropertiesServiceImpl.class | Bin 15056 -> 15048 bytes
.../data/service/impl/HzimsDataServiceImpl.class | Bin 10161 -> 10153 bytes
.../main/controller/HomePageController.class | Bin 6834 -> 0 bytes
.../main/controller/PVAppMainController.class | Bin 6341 -> 6333 bytes
.../main/scheduled/ScheduledCreateTask.class | Bin 8349 -> 9171 bytes
.../main/service/IHomePageService.class | Bin 4186 -> 4303 bytes
.../main/service/impl/AnalyseDataServiceImpl.class | Bin 2830 -> 2830 bytes
.../main/service/impl/AppHomeServiceImpl.class | Bin 43677 -> 43669 bytes
.../service/impl/AreaMonthReportServiceImpl.class | Bin 44435 -> 44427 bytes
.../main/service/impl/AreaServiceImpl.class | Bin 6408 -> 6400 bytes
.../main/service/impl/HomePageServiceImpl$2.class | Bin 1381 -> 1381 bytes
.../main/service/impl/HomePageServiceImpl$3.class | Bin 2619 -> 2619 bytes
.../main/service/impl/HomePageServiceImpl$4.class | Bin 1382 -> 1382 bytes
.../main/service/impl/HomePageServiceImpl$5.class | Bin 1382 -> 1382 bytes
.../main/service/impl/HomePageServiceImpl$6.class | Bin 978 -> 978 bytes
.../main/service/impl/HomePageServiceImpl$7.class | Bin 982 -> 982 bytes
.../main/service/impl/HomePageServiceImpl$8.class | Bin 982 -> 982 bytes
.../main/service/impl/HomePageServiceImpl$9.class | Bin 1015 -> 1015 bytes
.../main/service/impl/HomePageServiceImpl.class | Bin 108769 -> 106534 bytes
.../service/impl/MainWorkBenchServiceImpl.class | Bin 16857 -> 16849 bytes
.../main/service/impl/PVAppMainServiceImpl.class | Bin 15553 -> 15545 bytes
.../service/impl/RunMonthReportServiceImpl$1.class | Bin 3072 -> 3072 bytes
.../service/impl/RunMonthReportServiceImpl$2.class | Bin 3072 -> 3072 bytes
.../service/impl/RunMonthReportServiceImpl.class | Bin 39996 -> 40112 bytes
.../service/impl/SideHustleServiceImpl$1.class | Bin 908 -> 908 bytes
.../service/impl/SideHustleServiceImpl$2.class | Bin 1601 -> 1601 bytes
.../service/impl/SideHustleServiceImpl$3.class | Bin 1395 -> 1395 bytes
.../service/impl/SideHustleServiceImpl$4.class | Bin 937 -> 937 bytes
.../service/impl/SideHustleServiceImpl$5.class | Bin 1680 -> 1680 bytes
.../service/impl/SideHustleServiceImpl$6.class | Bin 1487 -> 1487 bytes
.../service/impl/SideHustleServiceImpl$7.class | Bin 1510 -> 1510 bytes
.../main/service/impl/SideHustleServiceImpl.class | Bin 85200 -> 85190 bytes
.../impl/UnitRunningTimeServiceImpl$1.class | Bin 947 -> 947 bytes
.../service/impl/UnitRunningTimeServiceImpl.class | Bin 13927 -> 14059 bytes
.../main/service/impl/WaterServiceImpl$1.class | Bin 2811 -> 2811 bytes
.../main/service/impl/WaterServiceImpl$2.class | Bin 870 -> 870 bytes
.../main/service/impl/WaterServiceImpl.class | Bin 65891 -> 65991 bytes
.../main/service/impl/WebHomeServiceImpl$1.class | Bin 882 -> 882 bytes
.../main/service/impl/WebHomeServiceImpl.class | Bin 36198 -> 36248 bytes
.../report/service/impl/DeptServiceImpl.class | Bin 10075 -> 10075 bytes
.../station/controller/StationController$1.class | Bin 3099 -> 3099 bytes
.../station/controller/StationController$2.class | Bin 2907 -> 2907 bytes
.../station/controller/StationController.class | Bin 11812 -> 14262 bytes
.../operational/station/feign/StationClient.class | Bin 9148 -> 9587 bytes
.../station/service/impl/ImsDeptServiceImpl.class | Bin 20398 -> 20390 bytes
.../service/impl/RealMonitorServiceImpl$1.class | Bin 931 -> 931 bytes
.../service/impl/RealMonitorServiceImpl$2.class | Bin 971 -> 971 bytes
.../service/impl/RealMonitorServiceImpl$3.class | Bin 3007 -> 3007 bytes
.../service/impl/RealMonitorServiceImpl$4.class | Bin 2676 -> 2676 bytes
.../service/impl/RealMonitorServiceImpl.class | Bin 52828 -> 52820 bytes
.../service/impl/StationServiceImpl$1.class | Bin 5568 -> 5568 bytes
.../service/impl/StationServiceImpl$2.class | Bin 3998 -> 3998 bytes
.../station/service/impl/StationServiceImpl.class | Bin 39484 -> 40415 bytes
.../station/utils/ArtemisPostUtils$1.class | Bin 907 -> 909 bytes
.../station/utils/ArtemisPostUtils$2.class | Bin 916 -> 918 bytes
.../service/impl/HzImsRealDataServiceImpl.class | Bin 8404 -> 8400 bytes
...springblade.core.launch.service.LauncherService | 1 -
.../operational/OperationApplicationTest.class | Bin 9681 -> 0 bytes
.../launcher/DemoTestLauncherServiceImpl.class | Bin 1022 -> 0 bytes
.../safeproduct/controller/AccidentController.java | 2 +
.../controller/DangerSourceController.java | 4 +-
.../controller/EmergencyPlanController.java | 2 +
.../controller/ImsMonCameraInfoController.java | 2 +
.../safeproduct/controller/ReviewController.java | 2 +
.../controller/SafetyToolController.java | 2 +
.../controller/SafetyToolTypeController.java | 2 +
.../controller/SystemFileController.java | 2 +
.../controller/SystemFileTypeController.java | 2 +
.../target/classes/META-INF/spring.factories | 12 +-
hzims-service/ticket/pom.xml | 5 +
.../com/hnac/hzims/ticket/aop/ApiLogAspect.java | 267 ++++++
.../hnac/hzims/ticket/aop/OperationAnnotation.java | 42 +
.../java/com/hnac/hzims/ticket/aop/SysLog.java | 80 ++
.../controller/TicketMatterGroupController.java | 4 +
.../controller/ProcessTypeController.java | 18 +-
.../ticket/processflow/listener/RedisListener.java | 21 +
.../processflow/strategy/core/TicketIdWorker.java | 1 +
.../controller/StandardTicketInfoController.java | 2 +
.../controller/WorkTicketInfoController.java | 3 +
.../controller/ProcessTypeController.class | Bin 5354 -> 5958 bytes
.../strategy/core/TicketIdWorker$TicketCode.class | Bin 2433 -> 2433 bytes
.../processflow/strategy/core/TicketIdWorker.class | Bin 5474 -> 5474 bytes
...springblade.core.launch.service.LauncherService | 1 -
.../ticket/target/test-classes/application.yml | 4 +
.../ticket/target/test-classes/classpath.index | Bin 188 -> 0 bytes
.../com/hnac/hzims/ticket/RedisTest.class | Bin 831 -> 0 bytes
.../hnac/hzims/ticket/TicketApplicationTest.class | Bin 4672 -> 0 bytes
.../launcher/DemoTestLauncherServiceImpl.class | Bin 1267 -> 0 bytes
.../controller/ImsTopvisionUserController.java | 2 +
log/error.log | 79 +-
log/info.log | 1003 ++++++++++++++------
204 files changed, 1664 insertions(+), 533 deletions(-)
create mode 100644 hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/IPUtils.java
delete mode 100644 hzims-service/operational/target/classes/com/hnac/hzims/operational/main/controller/HomePageController.class
delete mode 100644 hzims-service/operational/target/test-classes/META-INF/services/org.springblade.core.launch.service.LauncherService
delete mode 100644 hzims-service/operational/target/test-classes/com/hnac/hzims/operational/OperationApplicationTest.class
delete mode 100644 hzims-service/operational/target/test-classes/com/hnac/hzims/operational/launcher/DemoTestLauncherServiceImpl.class
create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/aop/ApiLogAspect.java
create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/aop/OperationAnnotation.java
create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/aop/SysLog.java
create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/listener/RedisListener.java
delete mode 100644 hzims-service/ticket/target/test-classes/META-INF/services/org.springblade.core.launch.service.LauncherService
delete mode 100644 hzims-service/ticket/target/test-classes/classpath.index
delete mode 100644 hzims-service/ticket/target/test-classes/com/hnac/hzims/ticket/RedisTest.class
delete mode 100644 hzims-service/ticket/target/test-classes/com/hnac/hzims/ticket/TicketApplicationTest.class
delete mode 100644 hzims-service/ticket/target/test-classes/com/hnac/hzims/ticket/launcher/DemoTestLauncherServiceImpl.class
diff --git a/hzims-biz-common/pom.xml b/hzims-biz-common/pom.xml
index c2535c2..b3927d9 100644
--- a/hzims-biz-common/pom.xml
+++ b/hzims-biz-common/pom.xml
@@ -40,6 +40,7 @@
org.springblade
blade-starter-datascope
+
diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/IPUtils.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/IPUtils.java
new file mode 100644
index 0000000..305e744
--- /dev/null
+++ b/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;
+ }
+
+
+}
diff --git a/hzims-service-api/equipment-api/target/classes/META-INF/spring.factories b/hzims-service-api/equipment-api/target/classes/META-INF/spring.factories
index 9a0348b..3e52282 100644
--- a/hzims-service-api/equipment-api/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service-api/hzims-operational-api/target/classes/META-INF/spring.factories b/hzims-service-api/hzims-operational-api/target/classes/META-INF/spring.factories
index f07e432..aa75d08 100644
--- a/hzims-service-api/hzims-operational-api/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service-api/safeproduct-api/target/classes/META-INF/spring.factories b/hzims-service-api/safeproduct-api/target/classes/META-INF/spring.factories
index cc5511a..270f095 100644
--- a/hzims-service-api/safeproduct-api/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java
index ccf43b1..275fe55 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java
index 94e06e9..72080a9 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java
index 70d427a..069240c 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java
index 04ee96e..08f01f1 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java
index 7fe15bb..b4af706 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java
index 3e34315..53b3a41 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java
index d66554b..9e126d2 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java
+++ b/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"),
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java
index 3514fdb..96c8446 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java
+++ b/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 = "获取供应商列表")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java
index 47b223b..6e11abe 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java
+++ b/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));
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java
index fa68d35..bdf1857 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java
+++ b/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")
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java
index 433c6f7..fdf0c1a 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java
+++ b/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> selectOptionList(Long deptId) {
+ public R>
+ selectOptionList(Long deptId) {
BladeUser user = AuthUtil.getUser();
if(null!=user){
List list = SP_WAREHOUSEService.selectOptionList(user.getTenantId(),deptId);
diff --git a/hzims-service/assets/target/classes/META-INF/spring.factories b/hzims-service/assets/target/classes/META-INF/spring.factories
index d9afb85..4f26227 100644
--- a/hzims-service/assets/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
index cd3f611..3a88024 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
+++ b/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")
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java
index 0128d34..aa206e9 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java
+++ b/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")
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java
index 2ddfded..82f8523 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java
+++ b/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)
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java
index 7ab3e50..a779382 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java
+++ b/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")
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java
index d08795f..175de5a 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java
+++ b/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 = "查询监测点列表")
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java
index 114fff7..129d3ba 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java
+++ b/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")
diff --git a/hzims-service/equipment/target/classes/META-INF/spring.factories b/hzims-service/equipment/target/classes/META-INF/spring.factories
index b9eed6c..de319bf 100644
--- a/hzims-service/equipment/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service/equipment/target/classes/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.class b/hzims-service/equipment/target/classes/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.class
index 19b370d3fb112d3bd27b98985c1639cf104fe962..6cb9d63c6a357cd6df5e9b75eafa709cfd5370e8 100644
GIT binary patch
delta 33
pcmaF%p7Gv$#tkn67%e9`N%Q6=X6ET9=jRodB<7WDmI^$h1^@x#4iW$W
delta 41
xcmccjp7Ggx#tkn67#$}$NsHztX6BWo<|XDOr|Ku?=M|SE=9Lt0779G01^|P&5o-Vd
diff --git a/hzims-service/message/target/classes/META-INF/spring.factories b/hzims-service/message/target/classes/META-INF/spring.factories
index 072b698..5d82d9f 100644
--- a/hzims-service/message/target/classes/META-INF/spring.factories
+++ b/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,\
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java
index 1c0d006..73c44ed 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java
index 8c436ed..9fb886d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java
index 7ceb38d..9f796e4 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java
index 8440cdc..c8fea79 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java
index 027b742..ecb6268 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java
index d0cab5e..e47713b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java
index 0f09231..f998393 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java
+++ b/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);
}
}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java
index d45652a..002ba80 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java
index 8a758d5..71f93cb 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java
index 3ec5da3..6c0c55e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
index 1c886e6..5af23db 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java
index e119cfb..b26c8b5 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java
+++ b/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 = "告警通知人")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java
index 4d2a9c6..c0f3299 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java
index 993eee8..7374e95 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java
index bf21c9b..011256e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java
+++ b/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 = "无需传入参数")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/DefectCheckController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/DefectCheckController.java
index 8fca437..660d34e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/DefectCheckController.java
+++ b/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 = "现象对象")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java
index 0312d3d..65eb6ba 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java
index ca350b2..50575c6 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java
index 994fd85..e4033a6 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java
index 4bca1b1..53bb13c 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/DutyGroupGeneratingCapacityController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/DutyGroupGeneratingCapacityController.java
index 515a365..a6c3c13 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/DutyGroupGeneratingCapacityController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java
index 52bb3fe..3abf73a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java
+++ b/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 = "")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java
index 40c2324..233e184 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java
index cd57be0..d254fc4 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java
index e505d8d..dc00d1d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java
index 378e287..3767429 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java
index 5346977..b9fac33 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java
index 8fb4054..ce0300e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecQRRecordController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecQRRecordController.java
index 2f38d72..89e675e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecQRRecordController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertPowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertPowerController.java
index e561b9c..c19f8a3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertPowerController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertUseController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertUseController.java
index 834e1bd..4e0615c 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/NotInsertUseController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java
index 41a1e8b..325097d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java
index b971260..2331d54 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java
+++ b/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 = "获取排序号")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java
index f019ffd..e99d597 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java
index 6069fe2..0f136e8 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java
index 3145265..691def2 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java
index f00b51a..5bc4b7e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java
index a74ea2f..eef6541 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java
index ddf5832..1351748 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AppHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AppHomeController.java
index ec30573..b9e16bf 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AppHomeController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java
index 5894383..ec40bdd 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java
index a4f38a3..5e02586 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java
index 8fdca62..a0f7a1d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java
index 49c4a6f..3c454f4 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java
index 8458045..1acc2e0 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java
index eb4a41b..1da5a90 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java
+++ b/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 = "")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java
index 55a1047..b7cecd7 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java
+++ b/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> getMainTaskMonthCount() {
return statisticService.getMainTaskMonthCount();
}
-
+ @ApiLog
@RequestMapping(value = "/getCurrentDutyTicketCount",method = {RequestMethod.POST,RequestMethod.GET})
@ApiOperationSupport(order = 2)
@ApiOperation("首页当班票据统计")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java
index 0d59599..da98029 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java
index 6fa1889..9e72c81 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java
+++ b/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 setRealDataByRealId() {
// String realData = "";
// redisTemplate.opsForValue().set(redisKeyConstants.getRealDataByRealId(),realData);
// return R.success("保存成功");
// }
-
+ @ApiLog
@GetMapping("/getDeptDataByUser")
@ApiOperation("获取用户光伏电站首页")
@ApiOperationSupport(order = 2)
public R> getDeptDataByUser() {
- List stationEntityList = stationService.list(
- Wrappers.lambdaQuery().eq(StationEntity::getType, HomePageConstant.PHOTOVOLTAIC)
- );
+ List stationEntityList = stationService.list(Wrappers.lambdaQuery().eq(StationEntity::getType, HomePageConstant.PHOTOVOLTAIC));
List result = stationEntityList.stream().map(stationEntity -> pvAppMainService.getDeptData(stationEntity)).collect(Collectors.toList());
return R.data(result);
}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java
index f3b205f..506aaf3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java
index 35cf937..fd8ae2a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java
index 070de06..d133b3e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java
index e46adb2..04c462f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java
+++ b/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 getData(@ApiParam("设备编码") String emCode){
return R.data(scanService.getData(emCode));
}
-
+ @ApiLog
@GetMapping("/getRealDataTimeAndDeviceFile")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "获取实时数据及设备档案)", notes = "")
public R getRealDataTimeAndDeviceFile(@ApiParam("设备编码") String emCode){
return R.data(scanService.getRealDataTimeAndDeviceFile(emCode));
}
-
+ @ApiLog
@GetMapping("/getBusinessRecords")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "获取业务档案)", notes = "")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java
index 336fb55..ff6e4a1 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java
+++ b/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 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 equipmentCountVoList = regionService.equipmentStateCount(deptId);
return R.data(equipmentCountVoList);
}
-
+ @ApiLog
@ApiOperation("集团/区域发电占比")
@GetMapping("/areaPowerScale")
@ApiOperationSupport(order = 3)
public R> areaPowerScale(@ApiParam(value = "区域机构ID") Long deptId) {
return R.data(regionService.areaPowerScale(deptId));
}
-
+ @ApiLog
@ApiOperation("集团/区域占比")
@GetMapping("/areaScale")
@ApiOperationSupport(order = 4)
public R> 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 powerFinishVoList = regionService.areaPowerMonth(deptId);
return R.data(powerFinishVoList);
}
-
+ @ApiLog
@ApiOperation("获取地图标记")
@GetMapping("/getMapMarker")
@ApiOperationSupport(order = 6)
public R> getMapMarker(@ApiParam(value = "区域机构ID") Long deptId,@RequestParam(value ="types") List types) {
return R.data(regionService.getMapMarker(deptId,types));
}
-
+ @ApiLog
@ApiOperation("区域当月发电量完成情况")
@GetMapping("/powerFinishMonth")
@ApiOperationSupport(order = 7)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java
index 8819eb9..d9056f3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java
+++ b/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 = "")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java
index f4ea88f..6a42ffd 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java
+++ b/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> list(UnitRunningTimeEntity entity, Query query){
@@ -44,6 +46,7 @@ public class UnitRunningTimeController extends BladeController {
/**
* 详情
*/
+ @ApiLog
@GetMapping("/detail")
@ApiOperation(value = "详情")
public R detail(UnitRunningTimeEntity entity){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java
index 381670b..53f7f60 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java
index a8b5a13..b5df6bd 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java
+++ b/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 list = service.getPumpList(deptId);
return R.data(list);
}
-
+ @ApiLog
@ApiOperation("闸门列表")
@GetMapping("/getGateList")
@ApiOperationSupport(order = 8)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WebHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WebHomeController.java
index eafbe58..db9ee80 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WebHomeController.java
+++ b/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 list = service.hydropowerDevice(deptId);
return R.data(list);
}
+ @ApiLog
@ApiOperation("水电站站点列表")
@GetMapping("/webStationList")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java
index a571fec..323e906 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java
+++ b/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 = "生成日常维护任务")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java
index 78f017e..05cda35 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java
+++ b/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 = "监控月报表")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java
index c01d7b0..ae9c0e8 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java
+++ b/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")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java
index 1dfc79a..e27ca8a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java
+++ b/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> list(OperMaintenancePlanDTO req, Query query) {
return planService.list(req, query);
}
-
+ @ApiLog
@GetMapping("/generateTask")
@ApiOperationSupport(order = 60)
@ApiOperation(value = "根据计划ID生成任务")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java
index 30abb52..7450800 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java
+++ b/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 = "删除日常维护工作流任务")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java
index aeab06d..3761c0e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java
+++ b/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> getCurrentUserDept(@RequestParam(required = false) String name,@RequestParam(required = false) String type){
return R.data(deptService.getCurrentUserDept(name,type));
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java
index 92af70d..1582112 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java
index 8ed1427..e55a84d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java
+++ b/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 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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java
index c6a26ee..f1fad85 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java
+++ b/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 save(@RequestBody ControlUsersEntity req) {
return R.status(controlUsersService.save(req));
}
-
+ @ApiLog
@GetMapping("/listPage")
@ApiOperation("分页查询")
@ApiOperationSupport(order = 2)
public R> listPage(ControlUsersEntity req, Query query) {
return R.data(controlUsersService.listPage(req,query));
}
-
+ @ApiLog
@GetMapping("/detail")
@ApiOperation("查看详情")
@ApiOperationSupport(order = 3)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java
index c84471e..ceef6cb 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java
+++ b/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;
/**
*
- * 分析模型站点 前端控制器
- *
+ * 分析模型站点 前端控制器
+ *
*
* @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> list(HzimsAnalyzeModelStationEntity entity, Query query){
- IPage page = analyzeModelStationService.page(Condition.getPage(query), Condition.getQueryWrapper(entity));
- return R.data(page);
- }
+ /**
+ * 查询分页数据
+ */
+ @ApiLog
+ @ApiOperation(value = "查询分页数据")
+ @GetMapping(value = "/list")
+ public R> list(HzimsAnalyzeModelStationEntity entity, Query query) {
+ IPage page = analyzeModelStationService.page(Condition.getPage(query), Condition.getQueryWrapper(entity));
+ return R.data(page);
+ }
- /**
+ /**
* 详情
*/
+ @ApiLog
@GetMapping("/detail")
- @ApiOperation(value = "详情")
- public R detail(HzimsAnalyzeModelStationEntity entity){
- HzimsAnalyzeModelStationEntity hzimsAnalyzeModelStationEntity = analyzeModelStationService.getOne(Condition.getQueryWrapper(entity));
- return R.data(hzimsAnalyzeModelStationEntity);
- }
+ @ApiOperation(value = "详情")
+ public R 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 classEntity = analyzeModelStationService.list(new LambdaQueryWrapper() {{
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)));
+ }
}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java
index ddc96da..66da705 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java
+++ b/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> list(ImsDeptEntity entity, Query query) {
@@ -50,6 +52,7 @@ public class ImsDeptController {
/**
* 详情
*/
+ @ApiLog
@GetMapping("/detail")
@ApiOperation(value = "详情")
public R detail(ImsDeptEntity entity) {
@@ -89,6 +92,7 @@ public class ImsDeptController {
/**
* 获取站点机构树
*/
+ @ApiLog
@ApiOperation(value = "获取水电站机构树")
@GetMapping(value = "/getHydropowerTree")
public R> 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> getTypeArea(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer typeArea,Long deptId) {
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java
index fe371d4..aac33ad 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java
+++ b/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 getMainList(StationAttributeDto attributeDto, Query query) {
return stationAttributeService.getMainList(attributeDto,query);
}
-
+ @ApiLog
@GetMapping("/listPage")
@ApiOperation("查詢屬性详情")
@ApiImplicitParams({
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
index e0e1cb8..818f61b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
+++ b/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 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 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 = "")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java
index 3184156..bcc3d17 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java
+++ b/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)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java
index 1b5fd18..2e793ec 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java
+++ b/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 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 getHikVideo(){
return R.data(stationVideoTypeService.getHikVideo());
}
-
+ @ApiLog
@RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST})
@ApiOperationSupport(order = 70)
@ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点")
public R> getStationsByVideo() {
return R.data(stationVideoTypeService.getStationsByVideo());
}
-
+ @ApiLog
@GetMapping("/getStationVideoOrderBySort")
@ApiOperationSupport(order = 80)
@ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表")
public R 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> 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> 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 getVideoReviewerToken() {
return R.data(stationVideoTypeService.getVideoReviewerToken());
}
-
+ @ApiLog
@GetMapping("/getVideoMonitorByAgency")
@ApiOperationSupport(order = 110)
@ApiOperation(value = "获取云服务站点(清污机类型)视频", notes = "根获取代运维站点(清污机类型)视频")
public R> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) {
return R.data(stationVideoTypeService.getVideoMonitor(type));
}
-
+ @ApiLog
@GetMapping("/getHikVisionStations")
@ApiOperationSupport(order = 120)
@ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表")
public R> getHikVisionStations() {
return R.data(stationVideoTypeService.getHikVisionStations());
}
-
+ @ApiLog
@GetMapping("/getMonitorsByStation")
@ApiOperationSupport(order = 130)
@ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java
index 178993b..7ea0dbc 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java
@@ -12,6 +12,7 @@ import javax.validation.Valid;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.common.constant.CommonConstant;
+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;
@@ -41,6 +42,7 @@ public class AppVersionController extends BladeController {
/**
* 详情
*/
+ @ApiLog
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入app_version")
@@ -52,6 +54,7 @@ public class AppVersionController extends BladeController {
/**
* 分页 代码自定义代号
*/
+ @ApiLog
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入app_version")
diff --git a/hzims-service/operational/target/classes/META-INF/spring.factories b/hzims-service/operational/target/classes/META-INF/spring.factories
index 41b7276..3379707 100644
--- a/hzims-service/operational/target/classes/META-INF/spring.factories
+++ b/hzims-service/operational/target/classes/META-INF/spring.factories
@@ -9,16 +9,16 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.main.service.impl.WebHomeServiceImpl,\
com.hnac.hzims.operational.alert.service.impl.HistoryAbnormalAlarmServiceImpl,\
com.hnac.hzims.operational.access.controller.OperAccessContentController,\
- com.hnac.hzims.operational.fill.service.impl.InsertPowerServiceImpl,\
com.hnac.hzims.operational.alert.service.impl.AlarmHandleDetailServiceImpl,\
+ com.hnac.hzims.operational.fill.service.impl.InsertPowerServiceImpl,\
com.hnac.hzims.operational.maintenance.feign.MaintenanceTaskClient,\
- com.hnac.hzims.operational.defect.feign.OperDefectClient,\
com.hnac.hzims.operational.defect.controller.OperDefectStatisticsController,\
+ com.hnac.hzims.operational.defect.feign.OperDefectClient,\
com.hnac.hzims.operational.maintenance.service.impl.OperMaintenancePlanServiceImpl,\
com.hnac.hzims.operational.access.controller.OperAccessStatisticsController,\
com.hnac.hzims.operational.alert.controller.AbnormalAlarmController,\
- com.hnac.hzims.operational.access.service.impl.OperAccessTaskDetailServiceImpl,\
com.hnac.hzims.operational.report.service.impl.OperPersonalMonthReportServiceImpl,\
+ com.hnac.hzims.operational.access.service.impl.OperAccessTaskDetailServiceImpl,\
com.hnac.hzims.operational.station.controller.ImsDeptController,\
com.hnac.hzims.operational.duty.scheduled.DutyMainCreateTask,\
com.hnac.hzims.operational.workOrder.service.impl.DistributeWorkOrderServiceImpl,\
@@ -33,27 +33,28 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.duty.service.impl.ImsDutyClassTypeServiceImpl,\
com.hnac.hzims.operational.report.service.impl.OperStationMonthReportServiceImpl,\
com.hnac.hzims.operational.maintenance.scheduled.MaintenanceTaskPushMsg,\
- com.hnac.hzims.operational.main.service.impl.SideHustleServiceImpl,\
com.hnac.hzims.operational.access.service.impl.OperAccessBaseMaterialServiceImpl,\
+ com.hnac.hzims.operational.main.service.impl.SideHustleServiceImpl,\
com.hnac.hzims.operational.main.controller.AreaMonthReportController,\
com.hnac.hzims.operational.station.service.impl.StationAttrConfigServiceImpl,\
- com.hnac.hzims.operational.main.scheduled.ScheduledCreateTask,\
com.hnac.hzims.operational.duty.feign.DutyRecClient,\
+ com.hnac.hzims.operational.main.scheduled.ScheduledCreateTask,\
com.hnac.hzims.operational.main.service.impl.ScanServiceImpl,\
com.hnac.hzims.operational.util.SpringContextHolder,\
- com.hnac.hzims.operational.duty.config.DutyConfiguration,\
com.hnac.hzims.operational.config.controller.StAlamRecordController,\
+ com.hnac.hzims.operational.duty.config.DutyConfiguration,\
com.hnac.hzims.operational.main.controller.FlawPhenomenonController,\
com.hnac.hzims.operational.main.controller.WaterHomeController,\
com.hnac.hzims.operational.duty.service.impl.ImsDutyMainServiceImpl,\
com.hnac.hzims.operational.station.service.impl.StationServiceImpl,\
com.hnac.hzims.operational.main.controller.PVAppMainController,\
+ com.hnac.hzims.operational.main.service.impl.PhotovoltaicServiceImpl,\
com.hnac.hzims.operational.config.service.impl.StFocusPropertiesServiceImpl,\
com.hnac.hzims.operational.config.controller.StFocusPropertiesController,\
- com.hnac.hzims.operational.main.controller.HomePageController,\
com.hnac.hzims.operational.fill.controller.InsertUseController,\
com.hnac.hzims.operational.access.controller.OperAccessLibraryDetailController,\
com.hnac.hzims.operational.main.service.impl.AreaMonthReportServiceImpl,\
+ com.hnac.hzims.operational.main.controller.PhotovoltaicController,\
com.hnac.hzims.operational.alert.WebSocketClientManager,\
com.hnac.hzims.operational.fill.service.impl.NotInsertUseServiceImpl,\
com.hnac.hzims.operational.station.service.impl.RealMonitorServiceImpl,\
@@ -74,9 +75,10 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.fill.controller.OverController,\
com.hnac.hzims.operational.defect.feign.OperPhenomenonClient,\
com.hnac.hzims.operational.fill.controller.OverDetailsController,\
- com.hnac.hzims.operational.station.controller.ControlUsersController,\
com.hnac.hzims.operational.main.controller.UserFeedbackController,\
+ com.hnac.hzims.operational.station.controller.ControlUsersController,\
com.hnac.hzims.operational.main.service.impl.RunMonthReportServiceImpl,\
+ com.hnac.hzims.operational.main.controller.HydropowerController,\
com.hnac.hzims.operational.fill.service.impl.NotInsertPowerServiceImpl,\
com.hnac.hzims.operational.maintenance.service.impl.OperMaintenanceLibraryServiceImpl,\
com.hnac.hzims.operational.station.service.impl.ControlUsersServiceImpl,\
@@ -95,12 +97,12 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.main.controller.MainReportController,\
com.hnac.hzims.operational.maintenance.feign.TaskClient,\
com.hnac.hzims.operational.duty.feign.DutyClassClient,\
- com.hnac.hzims.operational.maintenance.controller.OperMaintenanceParameterController,\
com.hnac.hzims.operational.access.controller.OperAccessBaseMaterialController,\
+ com.hnac.hzims.operational.maintenance.controller.OperMaintenanceParameterController,\
com.hnac.hzims.operational.fill.service.impl.OtherServiceImpl,\
com.hnac.hzims.operational.main.service.impl.MainWorkBenchServiceImpl,\
- com.hnac.hzims.operational.defect.job.service.PhenoDeadlineManager,\
com.hnac.hzims.operational.station.controller.StationUserController,\
+ com.hnac.hzims.operational.defect.job.service.PhenoDeadlineManager,\
com.hnac.hzims.operational.version.controller.AppVersionController,\
com.hnac.hzims.operational.feign.OperTaskClient,\
com.hnac.hzims.operational.maintenance.scheduled.MaintenancePlanCreateTask,\
@@ -121,8 +123,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.main.controller.MainSystemMonitoringController,\
com.hnac.hzims.operational.access.service.impl.OperAccessStatisticsServiceImpl,\
com.hnac.hzims.operational.duty.service.impl.ImsDutyRecServiceImpl,\
- com.hnac.hzims.operational.vRView.ws.HzWebSocketServer,\
com.hnac.hzims.operational.defect.service.impl.DefectCheckServiceImpl,\
+ com.hnac.hzims.operational.vRView.ws.HzWebSocketServer,\
com.hnac.hzims.operational.fill.controller.OverConfigController,\
com.hnac.hzims.operational.fill.controller.InsertPowerController,\
com.hnac.hzims.operational.access.service.impl.OperAccessLibraryServiceImpl,\
@@ -135,8 +137,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.station.controller.StationAttributeController,\
com.hnac.hzims.operational.defect.config.ExampleConfiguration,\
com.hnac.hzims.operational.duty.controller.ImsDutyRecController,\
- com.hnac.hzims.operational.alert.service.impl.AbnormalAlarmServiceImpl,\
com.hnac.hzims.operational.data.service.impl.HzimsDataServiceImpl,\
+ com.hnac.hzims.operational.alert.service.impl.AbnormalAlarmServiceImpl,\
com.hnac.hzims.operational.access.service.impl.OperAccessTaskServiceImpl,\
com.hnac.hzims.operational.config.controller.FocusAttributeController,\
com.hnac.hzims.operational.main.service.impl.AreaServiceImpl,\
@@ -145,11 +147,11 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.station.feign.StationVideoTypeClient,\
com.hnac.hzims.operational.config.config.WebSocketConfig,\
com.hnac.hzims.operational.duty.controller.ImsDutyMainController,\
- com.hnac.hzims.operational.duty.service.impl.DutyGroupGeneratingCapacityServiceImpl,\
com.hnac.hzims.operational.fill.controller.OtherController,\
+ com.hnac.hzims.operational.duty.service.impl.DutyGroupGeneratingCapacityServiceImpl,\
com.hnac.hzims.operational.main.service.impl.WaterServiceImpl,\
- com.hnac.hzims.operational.defect.job.DefetctJob,\
com.hnac.hzims.operational.config.service.impl.FocusAttributeServiceImpl,\
+ com.hnac.hzims.operational.defect.job.DefetctJob,\
com.hnac.hzims.operational.maintenance.service.impl.MaintenanceProcessServiceImpl,\
com.hnac.hzims.operational.OperationApplication,\
com.hnac.hzims.operational.main.service.impl.WeatherServiceImpl,\
@@ -162,8 +164,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.maintenance.service.impl.OperMaintenanceMonitorServiceImpl,\
com.hnac.hzims.operational.config.service.impl.CentralMonitorServiceImpl,\
com.hnac.hzims.operational.config.scheduled.StAlamRecordTask,\
- com.hnac.hzims.operational.main.controller.ScanController,\
com.hnac.hzims.operational.constants.RedisKeyConstants,\
+ com.hnac.hzims.operational.main.controller.ScanController,\
com.hnac.hzims.operational.defect.controller.OperFaultController,\
com.hnac.hzims.operational.main.controller.RunMonthReportController,\
com.hnac.hzims.operational.access.service.impl.OperAccessContentDetailServiceImpl,\
@@ -177,8 +179,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.config.ws.MyInterceptor,\
com.hnac.hzims.operational.report.service.impl.TaskMonthServiceImpl,\
com.hnac.hzims.operational.config.controller.HistoryAbnormalAlarmController,\
- com.hnac.hzims.operational.access.controller.OperAccessContentDetailController,\
com.hnac.hzims.operational.main.scheduled.RealDataSchedule,\
+ com.hnac.hzims.operational.access.controller.OperAccessContentDetailController,\
com.hnac.hzims.operational.fill.service.impl.PowerServiceImpl,\
com.hnac.hzims.operational.access.controller.OperAccessMaterialController,\
com.hnac.hzims.operational.alert.service.impl.AlertDefectServiceImpl,\
@@ -189,8 +191,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.defect.service.impl.OperDefectServiceImpl,\
com.hnac.hzims.operational.duty.controller.ImsDutyRecQRRecordController,\
com.hnac.hzims.operational.station.service.impl.ImsDeptServiceImpl,\
- com.hnac.hzims.operational.duty.service.impl.ImsDutyClassServiceImpl,\
com.hnac.hzims.operational.duty.controller.ImsDutyMainTemplateController,\
+ com.hnac.hzims.operational.duty.service.impl.ImsDutyClassServiceImpl,\
com.hnac.hzims.operational.access.schedule.TaskEndMonitor,\
com.hnac.hzims.operational.access.controller.OperAccessTaskDetailController,\
com.hnac.hzims.operational.maintenance.scheduled.TaskOverdueHandler,\
@@ -198,8 +200,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.hnac.hzims.operational.duty.controller.DemoController,\
com.hnac.hzims.operational.census.controller.CensusController,\
com.hnac.hzims.operational.station.service.impl.HzimsAnalyzeModelStationServiceImpl,\
- com.hnac.hzims.operational.vRView.scheduled.TimeTask,\
com.hnac.hzims.operational.fill.service.impl.RainFallServiceImpl,\
+ com.hnac.hzims.operational.vRView.scheduled.TimeTask,\
com.hnac.hzims.operational.fill.controller.StorageController,\
com.hnac.hzims.operational.config.service.impl.StAlamRecordServiceImpl,\
com.hnac.hzims.operational.main.service.impl.HomePageServiceImpl,\
diff --git a/hzims-service/operational/target/classes/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.class b/hzims-service/operational/target/classes/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.class
index 5829905b2f93e39b8cc6f0a8f6d02f0c2846a1fb..247535561a62234a601b0af5bc3adadd969cd66b 100644
GIT binary patch
delta 610
zcmWNOdrZw?7{@JmUJ8of0OC%eA$SpLNOe<^>&p*%me)m4__wqcEutdUgIop-)VI*D>n8O6-
zGKG1#$b!7X<3fC^gJMLWBB
z$sXRZmmYP|&wh!bQk)#Hi`{wRtij@l#;9c+M^)yS-8myslIw`$q$aCp5~uKRT2;@G
z&skP+jxC&5y$j0UKqZ)R`TUaa9?vF^lUgxG%dKyUdK7&(#=k_~nm+$Td1evn+a
delta 610
zcmWNOSxD4T6vlsNZ2Mai4HQCzWQ0OuP+?9r5!OgKi&~~FW>`JgG7t^)pqAOb*?Kbq
z%Zi|V{|6CFR+6PH8a9>n(1V%SUS>rrotJy>$31+%^PLl^kw}eP%yp+{G6)}u_!&un
zG=g}@Vk+6>lEWgVvw|6vsM^Y0Dkxjjo%=1O7ydoWXjZgl@eB~Te+64VL5B{wT?Zkr-qH3XA@W1Of6feSK@uP(ZY6~
zE4hswd}Jrz*d-2jiwk3iJq6;b#^RvHIK*%@N#?Nqa$=IC94DR=n(QR0oWjd#rJm8A
z&$3iGWn7?wOUk^g{#WeLlcJJ&T^(wf%ncTBTeH+_gLhcTU2U&H%NjA<;{XqI01s)>
z*1CDjKcW)L6B)o$8NxG3=7pV|?r{{hF_c$~pq&Z4)|qzdRNs)tTb<%NMZBk&4~qDt
zi9fTSFI?lhf_|v+PdfM|mLTyW;uVMFNQ~r54_PQZB`kgI&M96Iw@JyUmQ=ejqb^2L
zO=ad@s~2(7n*`}&l6)bDh^g|0tlz}(hXnqbSbv4prRuAyZe#pK(qX#&qoma&2Ie_i
zhywi(JqMekzJcagz-=`VLo-eunfAae>!zw(s_Kk4Sniyu%gxiE`MTWMra4$DX~vh;
F^&kCwsTcqN
diff --git a/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.class b/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.class
index f856d786c939262c146df074ab744f7dc6a4a180..78992be61f3b3bcc2e1fcb78e7d64cac23bcba35 100644
GIT binary patch
delta 2199
zcmchY+gnss7{=cs~JF!LI?;dGsu);WC$YVl!b+qNMeU+gusMBHc**4mRV8e
zp=};IT4V>a62}uf+0#`QU3J%07ajEJdFpSdzHjZl$3f_}i@j#8Z+~m8-+JF~?HOPB
zYg6Kfzo)+iP>*RZ=3$=?FXI&*uVS2guW|Fbj{SIpdj~We8H`JHw}hzxVLw@Y}EKY8q7ZDFl5p`&Ni80m~R
zHq(^cYbU1v*n8#oZ;oHxfArdcQ&$g8Fs^2{1nSI)3}k6x3(VXiJIp=4V|tcAW;hlf
z9UMuXk>3m9O&b1Eu{0kA8s3w5A0KEqDKUZ%CHe7@L<1%?d@OMapGbU)&jeZz@2D^j
zWmT+@_#CGt#_)y28GI@66~5MRR$>z8B$7BU@dPeNT*QRLC0v%+g{fp+cF5!ERcFm{
z&ScBfSi{m}J5lGP=BE5}CG*HefQ}4erJj%ag(yM>ip{Em%EWw%>2OiI1QInUpe@z+!q_w0I5u^6MZa
zhq@sQ)M6>h1nSlyj9VxtWZ+gTGq9X8>TSf|W*{!7ZR-C|#1({?n2C6sgV=!E={Uu7
ztcMAh6$}K=LrlRV&=$H3_gM5_*-QFR;>WfprpdCGMa_95Jm(BSlEPdP-iU
z4xtjIk?
zKWBZdn}hM*RDIp&K(;xM>q#aLU4fIu3lw4|fdk!X?)X!9ejATBwuNzu`F<8&74rj*
zAnndx8?3!LXqFd(@7{y-JVcL=%Y_FU=@D7z#3togWWIGDEtuXknDo2YrRvRw>7o^8
z!)$h7x*eD;4D*QEJ)d`flpd;>$ME=Ox_wdRppQ-r3HmP3pp{;8MfCGY
z6|_Y-lt!2?*H-ksTE?oQUPT%v3+;M+(!uOQKl6}~2?N{kR5x5b*p2~i25G5y
z>Z&!+h@HC0x@y^CF0P%5i@!>gXxnHZ4Bd#Z!$BCf5E9BvV>ZGFM%g1;aXlS??~uCf
zq1q|rxaWe{ry#8B7D&}nfIjM
zrC};sS*fgJt7t8KsvdgtIiFmsKfpJa4=%rZ&&*+5^4!DTv+uvp{{Fsu?k_kxxAULJ
zf7}63gBu}a;nP%nhR;pJu}8J`s%oE!{Wzdn2Mrujox`egL{&%C(l1PWiLX@mn5vGe
z>V%1j=r=H6;Omi1{eb`kO095ef%R`7WEBV7gMLO8m*YW^IFPbf2w&nag?Utv(=JmO$m|yrw~Ts?{J~0%tnp@
zOJWcw4V;qLg3}V!I3rPuvj)DAIEV8R-(pChZs2ZRwZsK{C((_I5|?mUVi;EpT$T79
zKS=zDYZ5=(;@LZ^4W@V7RW>a3i(y7=TO9bsx=wK@Ns1jQ&0jwrgBtr&K{Y@ky4I?eB1&q
z2Fh4`DChCul%F94qHPc{RA2^*1S(hH1ypfOG=`a&6~l{MQSBfO=XnvU8K&m{M64lV
zTqDkQ5nplX)w5?Co1j^2V8MNnW>#qaRnHP5uDt~tFmW-3TIyd-ISC?0mF3U(zZ>J8hhVsii46EtEMo;o0Nrp($
zUlGS&S(9$8NMasBn`IE*Wj{#xlmzUD%%qD(z-_jfUv~w0!;Q7tj@8IrA&6XlnpoasNmX`Howr!T1iXzkI%h_qZFU=GqX)+O
z7Msz+s18gsPk0t)tqarY!n7%vcXad|75!ZnI%XZ(TQM8&DGqed&~e+*wd^WE(ribE
z1sp&7w4ZIjJ`JcIKNmV`*^XJSnW~tqD$X)arwgXc;zEAayEmi1Av0R>E5rzUUWp1lIW&`Wrv4WvbC`_`ZrY}|
amVTm
select h.*,handle_user,d.phenomenon_id,d.access_id,d.delay_time,d.delay_cause,
- d.false_alarm_desc,d.file_path,s.name as station_name
- from hzims_alarm_handle h left join hzims_alarm_handle_detail d
+ d.false_alarm_desc,d.file_path,s.name as station_name,p.check_process_instance_id,a.process_instance_id
+ from hzims_alarm_handle h
+ left join hzims_alarm_handle_detail d
on h.detail_id = d.id
left join hzims_station s
on h.station_code = s.code
+ left join hzims_oper_phenomenon p
+ on d.PHENOMENON_ID = p.id
+ left join hzims_oper_access_plan a
+ on d.access_id = a.id
h.is_deleted = 0
diff --git a/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.class b/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.class
index 0f4c0b4c06fb5db3ea0cd9165306c4c4a4703fda..7e870da840184600c41fd33052a81cef9d0eca66 100644
GIT binary patch
delta 193
zcmZn_o+KiC>ff$?3=9k=3>xeVs_YDE>ff$?3=9k=465u5O6&~E>93%CFP
diff --git a/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.class b/hzims-service/operational/target/classes/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.class
index b7bdbbe7f34868b94f2fcad528d028f736f8030e..79d05a297adfbbb5f63e51599865c57f4daf3f8c 100644
GIT binary patch
delta 4232
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 ~#x2B2UOS!4Om}-;Za`TfZMCpk5*>vLIquku
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
TKK+GD9r>30jq~(R@{<1tBVe(I
delta 9117
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