瀏覽代碼

service层注释添加和多余代码删除

jichaobo 3 年之前
父節點
當前提交
dbeacbc537
共有 53 個文件被更改,包括 151 次插入291 次删除
  1. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/ConsumeEnergyConfigService.java
  2. 0 2
      fiveep-service/src/main/java/com/bizmatics/service/DeviceAnalogVariableListService.java
  3. 0 3
      fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java
  4. 5 6
      fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java
  5. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/DeviceStatusService.java
  6. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/DevopsOrderDeviceService.java
  7. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/DevopsOrderInspectorsService.java
  8. 3 5
      fiveep-service/src/main/java/com/bizmatics/service/DevopsWorkOrderService.java
  9. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolCheckEntryService.java
  10. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolContentEntryService.java
  11. 3 5
      fiveep-service/src/main/java/com/bizmatics/service/PatrolDeviceTypeService.java
  12. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionContentService.java
  13. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionDeviceService.java
  14. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionRecordService.java
  15. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionRouteService.java
  16. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionSchemeService.java
  17. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionTeamService.java
  18. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectorsService.java
  19. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolManufacturerService.java
  20. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolRecordRouteService.java
  21. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolRouteContentService.java
  22. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PatrolTeamInspectionService.java
  23. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/PowerQualityConfigService.java
  24. 2 6
      fiveep-service/src/main/java/com/bizmatics/service/RouteService.java
  25. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/SiteDynamicPropertiesService.java
  26. 2 9
      fiveep-service/src/main/java/com/bizmatics/service/SiteGroupingService.java
  27. 3 6
      fiveep-service/src/main/java/com/bizmatics/service/WcBlackoutPlanService.java
  28. 3 7
      fiveep-service/src/main/java/com/bizmatics/service/impl/ConsumeEnergyConfigServiceImpl.java
  29. 9 20
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java
  30. 2 10
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java
  31. 9 16
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java
  32. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceStatusServiceImpl.java
  33. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsOrderDeviceServiceImpl.java
  34. 1 3
      fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsOrderInspectorsServiceImpl.java
  35. 10 13
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolCheckEntryServiceImpl.java
  36. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolContentEntryServiceImpl.java
  37. 9 13
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolDeviceTypeServiceImpl.java
  38. 7 11
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionContentServiceImpl.java
  39. 1 3
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionDeviceServiceImpl.java
  40. 5 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionRecordServiceImpl.java
  41. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionRouteServiceImpl.java
  42. 0 2
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionSchemeServiceImpl.java
  43. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionTeamServiceImpl.java
  44. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectorsServiceImpl.java
  45. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolManufacturerServiceImpl.java
  46. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolRecordRouteServiceImpl.java
  47. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolRouteContentServiceImpl.java
  48. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolTeamInspectionServiceImpl.java
  49. 5 7
      fiveep-service/src/main/java/com/bizmatics/service/impl/PowerQualityConfigServiceImpl.java
  50. 2 6
      fiveep-service/src/main/java/com/bizmatics/service/impl/RouteServiceImpl.java
  51. 2 4
      fiveep-service/src/main/java/com/bizmatics/service/impl/SiteDynamicPropertiesServiceImpl.java
  52. 3 5
      fiveep-service/src/main/java/com/bizmatics/service/impl/SiteGroupingServiceImpl.java
  53. 7 9
      fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/ConsumeEnergyConfigService.java

@@ -1,14 +1,12 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.ConsumeEnergyConfig;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.ConsumeEnergyConfig;
 
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 能源配置
  *
  * @author ya
  * @since 2021-10-13

+ 0 - 2
fiveep-service/src/main/java/com/bizmatics/service/DeviceAnalogVariableListService.java

@@ -6,9 +6,7 @@ import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 
 /**
- * <p>
  * 设备变量列表 服务类
- * </p>
  *
  * @author ya
  * @since 2021-09-24

+ 0 - 3
fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java

@@ -2,15 +2,12 @@ package com.bizmatics.service;
 
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceAttribute;
-import com.bizmatics.model.vo.DeviceAttributeVo;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
 
 import java.util.List;
 
 /**
- * <p>
  * 设备属性 服务类
- * </p>
  *
  * @author ya
  * @since 2021-09-24

+ 5 - 6
fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -1,10 +1,9 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceList;
-import com.bizmatics.model.TemplateData;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
@@ -14,9 +13,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 设备
  *
  * @author ya
  * @since 2021-07-07
@@ -25,6 +22,7 @@ public interface DeviceService extends CrudService<Device> {
 
     /**
      * 查询不同状态设备数量
+     *
      * @return
      */
     DeviceCountVO selectDeviceCount(Date startTime, Date endTime);
@@ -32,6 +30,7 @@ public interface DeviceService extends CrudService<Device> {
 
     /**
      * 查询不同类型的设备数量
+     *
      * @param site
      * @return
      */
@@ -39,7 +38,7 @@ public interface DeviceService extends CrudService<Device> {
 
     List<DeviceList> deviceList(String siteId);
 
-    List<Device> dataManagementDeviceList(int siteId,int deviceType);
+    List<Device> dataManagementDeviceList(int siteId, int deviceType);
 
     void correspondDeviceAdd(CorrespondDeviceVOT correspondDeviceVOT);
 

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/DeviceStatusService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.DeviceStatus;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DeviceStatus;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-07-07

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/DevopsOrderDeviceService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.DevopsOrderDevice;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DevopsOrderDevice;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-21

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/DevopsOrderInspectorsService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.DevopsOrderInspectors;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DevopsOrderInspectors;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-21

+ 3 - 5
fiveep-service/src/main/java/com/bizmatics/service/DevopsWorkOrderService.java

@@ -1,17 +1,15 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.DevopsWorkOrder;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DevopsWorkOrder;
 import com.bizmatics.model.PatrolInspectors;
 import com.bizmatics.model.vo.*;
 
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 运维管理-工单管理
  *
  * @author ya
  * @since 2021-10-21
@@ -27,7 +25,7 @@ public interface DevopsWorkOrderService extends CrudService<DevopsWorkOrder> {
 
     void devopsOrderInspectorsDel(Integer inspectorsId);
 
-    CommonPage<DevopsWorkOrderListVo> devopsWorkOrderList(Integer generationMode, Integer workOrderStatus,Integer siteId, Integer inspectorsId, Integer size, Integer current);
+    CommonPage<DevopsWorkOrderListVo> devopsWorkOrderList(Integer generationMode, Integer workOrderStatus, Integer siteId, Integer inspectorsId, Integer size, Integer current);
 
     List<DevopsWorkOrderDetailsVo> devopsWorkOrderDetails(Integer id);
 

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolCheckEntryService.java

@@ -8,9 +8,7 @@ import com.bizmatics.common.mvc.base.CrudService;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 检查条目检查项
  *
  * @author ya
  * @since 2021-10-15
@@ -22,7 +20,7 @@ public interface PatrolCheckEntryService extends CrudService<PatrolCheckEntry> {
 
     void patrolCheckEntryDel(Integer id);
 
-    CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName, Integer deviceTypeId, Integer size, Integer current,Integer id);
+    CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName, Integer deviceTypeId, Integer size, Integer current, Integer id);
 
     List<PatrolCheckEntry> patrolCheckEntrydDroplist(Integer deviceTypeId);
 }

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolContentEntryService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolContentEntry;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolContentEntry;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-16

+ 3 - 5
fiveep-service/src/main/java/com/bizmatics/service/PatrolDeviceTypeService.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolDeviceType;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolDeviceType;
 import com.bizmatics.model.vo.PatrolDeviceListVO;
 
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 检查条目设备类型
  *
  * @author ya
  * @since 2021-10-15
@@ -21,5 +19,5 @@ public interface PatrolDeviceTypeService extends CrudService<PatrolDeviceType> {
 
     void patrolDeviceTypeDel(Integer id);
 
-    List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName,Integer id);
+    List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName, Integer id);
 }

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionContentService.java

@@ -1,8 +1,8 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.PatrolContentEntry;
 import com.bizmatics.model.PatrolInspectionContent;
-import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.vo.PatrolInspectionContentListVo;
 import com.bizmatics.model.vo.PatrolInspectionContentVo;
 import com.bizmatics.model.vo.SiteDeviceCountVo;
@@ -10,9 +10,7 @@ import com.bizmatics.model.vo.SiteDeviceCountVo;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 巡检内容
  *
  * @author ya
  * @since 2021-10-16

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionDeviceService.java

@@ -1,7 +1,7 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolInspectionDevice;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolInspectionDevice;
 import com.bizmatics.model.vo.PatrolInspectionDeviceVo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -9,9 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 巡检设备
  *
  * @author ya
  * @since 2021-10-15

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionRecordService.java

@@ -1,8 +1,8 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.PatrolInspectionRecord;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolInspectionRecord;
 import com.bizmatics.model.vo.CurrencyDroplistVo;
 import com.bizmatics.model.vo.PatrolInspectionRecordDetailsVo;
 import com.bizmatics.model.vo.PatrolInspectionRecordVo;
@@ -10,9 +10,7 @@ import com.bizmatics.model.vo.PatrolInspectionRecordVo;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 巡检记录
  *
  * @author ya
  * @since 2021-10-20

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionRouteService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolInspectionRoute;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolInspectionRoute;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-19

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionSchemeService.java

@@ -1,9 +1,9 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.PatrolInspectionContent;
 import com.bizmatics.model.PatrolInspectionScheme;
-import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.vo.PatrolCheckEntryVo;
 import com.bizmatics.model.vo.PatrolInspectionSchemeListVo;
 import com.bizmatics.model.vo.PatrolInspectionSchemeOneVo;
@@ -12,9 +12,7 @@ import com.bizmatics.model.vo.PatrolInspectionSchemeVo;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 巡检管理-巡检计划
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectionTeamService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolInspectionTeam;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolInspectionTeam;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolInspectorsService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolInspectors;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolInspectors;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolManufacturerService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolManufacturer;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolManufacturer;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-15

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolRecordRouteService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolRecordRoute;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolRecordRoute;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-20

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolRouteContentService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolRouteContent;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolRouteContent;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-19

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PatrolTeamInspectionService.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PatrolTeamInspection;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PatrolTeamInspection;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/PowerQualityConfigService.java

@@ -1,14 +1,12 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PowerQualityConfig;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PowerQualityConfig;
 
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 电能质量评分配置
  *
  * @author ya
  * @since 2021-10-09

+ 2 - 6
fiveep-service/src/main/java/com/bizmatics/service/RouteService.java

@@ -1,14 +1,10 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.Route;
 import com.bizmatics.common.mvc.base.CrudService;
-
-import java.util.List;
+import com.bizmatics.model.Route;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-07-07

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/SiteDynamicPropertiesService.java

@@ -1,13 +1,11 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.SiteDynamicProperties;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.SiteDynamicProperties;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * <p>
- * 站点动态属性表 服务类
- * </p>
+ * 站点动态属性表 服务实现类
  *
  * @author ya
  * @since 2021-09-22

+ 2 - 9
fiveep-service/src/main/java/com/bizmatics/service/SiteGroupingService.java

@@ -1,29 +1,22 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.Site;
-import com.bizmatics.model.SiteGrouping;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.SiteGrouping;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
- * <p>
- *  服务类
- * </p>
+ * 站点分组
  *
  * @author ya
  * @since 2021-09-17
  */
 public interface SiteGroupingService extends CrudService<SiteGrouping> {
     /**
-     *
      * @param groupingName
      */
     void siteGroupingAdd(@Param("groupingName") String groupingName);
 
     /**
-     *
      * @param groupingName
      * @param id
      */

+ 3 - 6
fiveep-service/src/main/java/com/bizmatics/service/WcBlackoutPlanService.java

@@ -1,16 +1,13 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.model.vo.WcBlackoutPlanVo;
 
-import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ * 计划停电
  *
  * @author ya
  * @since 2021-07-07
@@ -23,5 +20,5 @@ public interface WcBlackoutPlanService extends CrudService<WcBlackoutPlan> {
 
     void plannedOutageDel(int id);
 
-    List<WcBlackoutPlanVo> plannedOutageList(String startTime , String endTime , int type,int id);
+    List<WcBlackoutPlanVo> plannedOutageList(String startTime, String endTime, int type, int id);
 }

+ 3 - 7
fiveep-service/src/main/java/com/bizmatics/service/impl/ConsumeEnergyConfigServiceImpl.java

@@ -2,20 +2,16 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.ConsumeEnergyConfig;
-import com.bizmatics.model.HadSiteStatic;
 import com.bizmatics.persistence.mapper.ConsumeEnergyConfigMapper;
 import com.bizmatics.service.ConsumeEnergyConfigService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
-import java.sql.Wrapper;
 import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 能源配置
  *
  * @author ya
  * @since 2021-10-13
@@ -26,7 +22,7 @@ public class ConsumeEnergyConfigServiceImpl extends AbstractCrudService<ConsumeE
     @Override
     public List<ConsumeEnergyConfig> list(int siteId) {
         LambdaQueryWrapper<ConsumeEnergyConfig> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ConsumeEnergyConfig::getSiteId,siteId).eq(ConsumeEnergyConfig::getEnable,1);
+        queryWrapper.eq(ConsumeEnergyConfig::getSiteId, siteId).eq(ConsumeEnergyConfig::getEnable, 1);
         return this.list(queryWrapper);
     }
 }

+ 9 - 20
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -6,36 +6,25 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
-import com.bizmatics.model.TemplateData;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
-import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.util.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 设备变量列表 服务实现类
- * </p>
  *
  * @author ya
  * @since 2021-09-24
  */
 @Service
 public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<DeviceAnalogVariableListMapper, DeviceAnalogVariableList> implements DeviceAnalogVariableListService {
-    @Autowired
-    private DeviceAnalogVariableListService deviceAnalogVariableListService;
-    @Autowired
-    private DeviceService deviceService;
 
     @Override
     public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
@@ -77,16 +66,16 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     }
 
     @Override
-    public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo){
-        int start_current=(deviceAnalogVariableListVo.getSize()-1)*deviceAnalogVariableListVo.getCurrent();
-        List<DeviceAnalogVariableList> deviceAnalogVariableListOne =  baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getVariableName(), null, null,deviceAnalogVariableListVo.getDataArea());
-        int total=0;
-        if (deviceAnalogVariableListOne.size()>0){
-            total= deviceAnalogVariableListOne.size();
+    public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
+        int start_current = (deviceAnalogVariableListVo.getSize() - 1) * deviceAnalogVariableListVo.getCurrent();
+        List<DeviceAnalogVariableList> deviceAnalogVariableListOne = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
+                deviceAnalogVariableListVo.getVariableName(), null, null, deviceAnalogVariableListVo.getDataArea());
+        int total = 0;
+        if (deviceAnalogVariableListOne.size() > 0) {
+            total = deviceAnalogVariableListOne.size();
         }
-        List<DeviceAnalogVariableList> deviceAnalogVariableList =  baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(),deviceAnalogVariableListVo.getDataArea());
+        List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
+                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getDataArea());
         return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
     }
 

+ 2 - 10
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java

@@ -2,12 +2,9 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.vo.DeviceAttributeVo;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.persistence.mapper.DeviceAttributeMapper;
 import com.bizmatics.service.DeviceAttributeService;
@@ -16,16 +13,11 @@ import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 设备属性 服务实现类
- * </p>
  *
  * @author ya
  * @since 2021-09-24
@@ -54,8 +46,8 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
     @Override
     public List<DeviceAttribute> deviceNewsList(int id, int siteId) {
         LambdaQueryWrapper<DeviceAttribute> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DeviceAttribute::getStatus, 1).eq(DeviceAttribute::getSiteId,siteId);
-        if(id!=0){
+        queryWrapper.eq(DeviceAttribute::getStatus, 1).eq(DeviceAttribute::getSiteId, siteId);
+        if (id != 0) {
             queryWrapper.eq(DeviceAttribute::getId, id);
         }
         List<DeviceAttribute> deviceAttributeList = this.list(queryWrapper);

+ 9 - 16
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -1,12 +1,10 @@
 package com.bizmatics.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
@@ -20,22 +18,18 @@ import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.enums.DeviceType;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.CommonIcoVO;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
 /**
- * <p>
- * 服务实现类
- * </p>
+ * 设备
  *
  * @author ya
  * @since 2021-07-07
@@ -156,9 +150,9 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     @Override
     public CommonPage<CorrespondDeviceVO> correspondDeviceList(String deviceName, int size, int current) {
         List<CorrespondDeviceVO> correspondDeviceListOne = baseMapper.CorrespondDeviceList(deviceName, null, null);
-        int total=0;
-        if (correspondDeviceListOne.size()>0){
-            total= correspondDeviceListOne.size();
+        int total = 0;
+        if (correspondDeviceListOne.size() > 0) {
+            total = correspondDeviceListOne.size();
         }
         int startCurrent = (size - 1) * current;
         List<CorrespondDeviceVO> correspondDeviceList = baseMapper.CorrespondDeviceList(deviceName, startCurrent, current);
@@ -166,11 +160,11 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public List<CorrespondDeviceListVO> correspondDeviceListEcho(int id){
+    public List<CorrespondDeviceListVO> correspondDeviceListEcho(int id) {
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getEnable, 1).eq(Device::getId, id);
         List<Device> deviceList = this.list(queryWrapper);
-        LambdaQueryWrapper<DeviceAnalogVariableList>  queryWrapperOne = Wrappers.lambdaQuery();
+        LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapperOne = Wrappers.lambdaQuery();
         queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getCommunicationEquipment, deviceList.get(0).getId());
         List<DeviceAnalogVariableList> deviceAnalogVariableList = deviceAnalogVariableListService.list(queryWrapperOne);
 
@@ -184,14 +178,14 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public CommonPage<Device> videoMonitoringDeviceList(String deviceName,Integer deviceType,Integer siteId, Integer size, Integer current){
+    public CommonPage<Device> videoMonitoringDeviceList(String deviceName, Integer deviceType, Integer siteId, Integer size, Integer current) {
         IPage<Device> page = new Page<Device>(size, current);
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getSiteId, siteId).eq(Device::getEnable, 1);
-        if (deviceType != null && deviceType!=0) {
+        if (deviceType != null && deviceType != 0) {
             queryWrapper.eq(Device::getDeviceType, deviceType);
         }
-        if (deviceName!=null && !deviceName.equals("") && !deviceName.equals(null)){
+        if (deviceName != null && !deviceName.equals("") && !deviceName.equals(null)) {
             queryWrapper.like(Device::getDeviceName, deviceName);
         }
 
@@ -201,5 +195,4 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
 
-
 }

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceStatusServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.DeviceStatus;
 import com.bizmatics.persistence.mapper.DeviceStatusMapper;
 import com.bizmatics.service.DeviceStatusService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-07-07

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsOrderDeviceServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.DevopsOrderDevice;
 import com.bizmatics.persistence.mapper.DevopsOrderDeviceMapper;
 import com.bizmatics.service.DevopsOrderDeviceService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-21

+ 1 - 3
fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsOrderInspectorsServiceImpl.java

@@ -7,9 +7,7 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-21

+ 10 - 13
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolCheckEntryServiceImpl.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.Device;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolCheckEntry;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.PatrolCheckEntryMapper;
 import com.bizmatics.service.PatrolCheckEntryService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
@@ -18,9 +17,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 检查条目检查项
  *
  * @author ya
  * @since 2021-10-15
@@ -29,7 +26,7 @@ import java.util.List;
 public class PatrolCheckEntryServiceImpl extends AbstractCrudService<PatrolCheckEntryMapper, PatrolCheckEntry> implements PatrolCheckEntryService {
 
     @Override
-    public void patrolCheckEntryAdd(PatrolCheckEntry patrolCheckEntry){
+    public void patrolCheckEntryAdd(PatrolCheckEntry patrolCheckEntry) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         patrolCheckEntry.setCreator(user.getUserName());
         patrolCheckEntry.setCreateTime(new Date());
@@ -38,12 +35,12 @@ public class PatrolCheckEntryServiceImpl extends AbstractCrudService<PatrolCheck
     }
 
     @Override
-    public void patrolCheckEntryUpdate(PatrolCheckEntry patrolCheckEntry){
+    public void patrolCheckEntryUpdate(PatrolCheckEntry patrolCheckEntry) {
         this.updateById(patrolCheckEntry);
     }
 
     @Override
-    public void patrolCheckEntryDel(Integer id){
+    public void patrolCheckEntryDel(Integer id) {
         PatrolCheckEntry patrolCheckEntry = new PatrolCheckEntry();
         patrolCheckEntry.setId(id);
         patrolCheckEntry.setStatus(0);
@@ -51,15 +48,15 @@ public class PatrolCheckEntryServiceImpl extends AbstractCrudService<PatrolCheck
     }
 
     @Override
-    public  CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName,Integer deviceTypeId,Integer size,Integer current,Integer id){
+    public CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName, Integer deviceTypeId, Integer size, Integer current, Integer id) {
         IPage<PatrolCheckEntry> page = new Page<PatrolCheckEntry>(size, current);
         LambdaQueryWrapper<PatrolCheckEntry> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolCheckEntry::getStatus, 1).eq(PatrolCheckEntry::getDeviceTypeId, deviceTypeId);
-        if (checkEntryName!=null&&!checkEntryName.equals("")&&!checkEntryName.equals(null)){
+        if (checkEntryName != null && !checkEntryName.equals("") && !checkEntryName.equals(null)) {
             queryWrapper.like(PatrolCheckEntry::getCheckEntryName, checkEntryName);
         }
-        if (id!=null&&id!=0){
-            queryWrapper.eq(PatrolCheckEntry::getId,id);
+        if (id != null && id != 0) {
+            queryWrapper.eq(PatrolCheckEntry::getId, id);
         }
         page = this.page(page, queryWrapper);
         this.ToCommonPage(page);
@@ -67,7 +64,7 @@ public class PatrolCheckEntryServiceImpl extends AbstractCrudService<PatrolCheck
     }
 
     @Override
-    public List<PatrolCheckEntry> patrolCheckEntrydDroplist(Integer deviceTypeId){
+    public List<PatrolCheckEntry> patrolCheckEntrydDroplist(Integer deviceTypeId) {
         LambdaQueryWrapper<PatrolCheckEntry> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolCheckEntry::getStatus, 1).in(PatrolCheckEntry::getDeviceTypeId, deviceTypeId);
         return this.list(queryWrapper);

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolContentEntryServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolContentEntry;
 import com.bizmatics.persistence.mapper.PatrolContentEntryMapper;
 import com.bizmatics.service.PatrolContentEntryService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-16

+ 9 - 13
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolDeviceTypeServiceImpl.java

@@ -13,9 +13,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 检查条目设备类型
  *
  * @author ya
  * @since 2021-10-15
@@ -23,9 +21,9 @@ import java.util.List;
 @Service
 public class PatrolDeviceTypeServiceImpl extends AbstractCrudService<PatrolDeviceTypeMapper, PatrolDeviceType> implements PatrolDeviceTypeService {
     @Override
-    public void patrolDeviceTypeAdd(String deviceTypeName){
+    public void patrolDeviceTypeAdd(String deviceTypeName) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+        PatrolDeviceType patrolDeviceType = new PatrolDeviceType();
         patrolDeviceType.setDeviceTypeName(deviceTypeName);
         patrolDeviceType.setCreator(user.getUserName());
         patrolDeviceType.setCreateTime(new Date());
@@ -34,29 +32,27 @@ public class PatrolDeviceTypeServiceImpl extends AbstractCrudService<PatrolDevic
     }
 
     @Override
-    public void patrolDeviceTypeUpdate(Integer id,String deviceTypeName){
-        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+    public void patrolDeviceTypeUpdate(Integer id, String deviceTypeName) {
+        PatrolDeviceType patrolDeviceType = new PatrolDeviceType();
         patrolDeviceType.setId(id);
         patrolDeviceType.setDeviceTypeName(deviceTypeName);
         this.updateById(patrolDeviceType);
     }
 
     @Override
-    public void patrolDeviceTypeDel(Integer id){
-        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+    public void patrolDeviceTypeDel(Integer id) {
+        PatrolDeviceType patrolDeviceType = new PatrolDeviceType();
         patrolDeviceType.setId(id);
         patrolDeviceType.setStatus(0);
         this.updateById(patrolDeviceType);
     }
 
 
-
     @Override
-    public List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName,Integer id){
-        List<PatrolDeviceListVO> patrolDeviceTypeList = baseMapper.patrolDeviceList(deviceTypeName,id);
+    public List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName, Integer id) {
+        List<PatrolDeviceListVO> patrolDeviceTypeList = baseMapper.patrolDeviceList(deviceTypeName, id);
         return patrolDeviceTypeList;
     }
 
 
-
 }

+ 7 - 11
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionContentServiceImpl.java

@@ -6,7 +6,6 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolCheckEntry;
 import com.bizmatics.model.PatrolContentEntry;
 import com.bizmatics.model.PatrolInspectionContent;
-import com.bizmatics.model.PatrolInspectionDevice;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.PatrolInspectionContentListVo;
 import com.bizmatics.model.vo.PatrolInspectionContentOneVo;
@@ -19,14 +18,11 @@ import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
- * 服务实现类
- * </p>
+ * 巡检内容
  *
  * @author ya
  * @since 2021-10-16
@@ -81,8 +77,8 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         queryWrapper.eq(PatrolContentEntry::getInspectionContentId, patrolInspectionContent.getId())
                 .eq(PatrolContentEntry::getInspectionDeviceId, patrolInspectionContent.getInspectionDeviceId());
         List<PatrolContentEntry> patrolContentEntryList = patrolContentEntryService.list(queryWrapper);
-        if (patrolContentEntryList.size()>0){
-            for (int i = 0;i<patrolContentEntryList.size();i++){
+        if (patrolContentEntryList.size() > 0) {
+            for (int i = 0; i < patrolContentEntryList.size(); i++) {
                 PatrolContentEntry patrolContentEntry = new PatrolContentEntry();
                 patrolContentEntry.setStatus(0);
                 patrolContentEntry.setId(patrolContentEntryList.get(i).getId());
@@ -90,8 +86,8 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
             }
         }
 
-        if (patrolInspectionContentVo.getPatrolCheckEntry().size()>0){
-            for (int i = 0; i < patrolInspectionContentVo.getPatrolCheckEntry().size(); i++){
+        if (patrolInspectionContentVo.getPatrolCheckEntry().size() > 0) {
+            for (int i = 0; i < patrolInspectionContentVo.getPatrolCheckEntry().size(); i++) {
                 PatrolContentEntry patrolContentEntry = new PatrolContentEntry();
                 patrolContentEntry.setInspectionContentId(patrolInspectionContent.getId());
                 patrolContentEntry.setInspectionDeviceId(patrolInspectionContent.getInspectionDeviceId());
@@ -169,7 +165,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
     }
 
     @Override
-    public List<PatrolContentEntry> patrolContentEntryList(Integer id){
+    public List<PatrolContentEntry> patrolContentEntryList(Integer id) {
         LambdaQueryWrapper<PatrolContentEntry> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolContentEntry::getStatus, 1)
                 .eq(PatrolContentEntry::getInspectionContentId, id);
@@ -178,7 +174,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
     }
 
     @Override
-    public List<SiteDeviceCountVo> patrolInspectionContentSiteList(String siteName){
+    public List<SiteDeviceCountVo> patrolInspectionContentSiteList(String siteName) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Integer userId = user.getUserId().intValue();
         List<SiteDeviceCountVo> list = baseMapper.patrolInspectionContentSiteList(siteName, userId);

+ 1 - 3
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionDeviceServiceImpl.java

@@ -19,9 +19,7 @@ import java.util.List;
 import java.util.UUID;
 
 /**
- * <p>
- * 服务实现类
- * </p>
+ * 巡检设备
  *
  * @author ya
  * @since 2021-10-15

+ 5 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionRecordServiceImpl.java

@@ -3,14 +3,17 @@ package com.bizmatics.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolInspectionRecord;
 import com.bizmatics.model.PatrolInspectors;
 import com.bizmatics.model.PatrolRecordRoute;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.vo.*;
+import com.bizmatics.model.vo.CurrencyDroplistVo;
+import com.bizmatics.model.vo.PatrolInspectionRecordDetailsVo;
+import com.bizmatics.model.vo.PatrolInspectionRecordVo;
+import com.bizmatics.model.vo.PatrolRouteContentListVo;
 import com.bizmatics.persistence.mapper.PatrolInspectionRecordMapper;
 import com.bizmatics.service.PatrolInspectionRecordService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.PatrolRecordRouteService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * <p>
  * 巡检记录
- * </p>
  *
  * @author ya
  * @since 2021-10-20

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionRouteServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolInspectionRoute;
 import com.bizmatics.persistence.mapper.PatrolInspectionRouteMapper;
 import com.bizmatics.service.PatrolInspectionRouteService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-19

+ 0 - 2
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionSchemeServiceImpl.java

@@ -22,9 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 巡检管理-巡检计划
- * </p>
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectionTeamServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolInspectionTeam;
 import com.bizmatics.persistence.mapper.PatrolInspectionTeamMapper;
 import com.bizmatics.service.PatrolInspectionTeamService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolInspectorsServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolInspectors;
 import com.bizmatics.persistence.mapper.PatrolInspectorsMapper;
 import com.bizmatics.service.PatrolInspectorsService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolManufacturerServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolManufacturer;
 import com.bizmatics.persistence.mapper.PatrolManufacturerMapper;
 import com.bizmatics.service.PatrolManufacturerService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-15

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolRecordRouteServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolRecordRoute;
 import com.bizmatics.persistence.mapper.PatrolRecordRouteMapper;
 import com.bizmatics.service.PatrolRecordRouteService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-20

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolRouteContentServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolRouteContent;
 import com.bizmatics.persistence.mapper.PatrolRouteContentMapper;
 import com.bizmatics.service.PatrolRouteContentService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-19

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolTeamInspectionServiceImpl.java

@@ -1,15 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PatrolTeamInspection;
 import com.bizmatics.persistence.mapper.PatrolTeamInspectionMapper;
 import com.bizmatics.service.PatrolTeamInspectionService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-10-18

+ 5 - 7
fiveep-service/src/main/java/com/bizmatics/service/impl/PowerQualityConfigServiceImpl.java

@@ -2,11 +2,11 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.PowerQualityConfig;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.PowerQualityConfigMapper;
 import com.bizmatics.service.PowerQualityConfigService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
@@ -14,9 +14,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 电能质量评分配置
  *
  * @author ya
  * @since 2021-10-09
@@ -25,7 +23,7 @@ import java.util.List;
 public class PowerQualityConfigServiceImpl extends AbstractCrudService<PowerQualityConfigMapper, PowerQualityConfig> implements PowerQualityConfigService {
 
     @Override
-    public void powerQualityAdd(PowerQualityConfig powerQualityConfig){
+    public void powerQualityAdd(PowerQualityConfig powerQualityConfig) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         powerQualityConfig.setEnable(1);
         powerQualityConfig.setCreator(user.getUserName());
@@ -34,7 +32,7 @@ public class PowerQualityConfigServiceImpl extends AbstractCrudService<PowerQual
     }
 
     @Override
-    public void powerQualityUpdate(PowerQualityConfig powerQualityConfig){
+    public void powerQualityUpdate(PowerQualityConfig powerQualityConfig) {
         this.updateById(powerQualityConfig);
     }
 
@@ -47,7 +45,7 @@ public class PowerQualityConfigServiceImpl extends AbstractCrudService<PowerQual
     }
 
     @Override
-    public void powerQualityDel(int id){
+    public void powerQualityDel(int id) {
         PowerQualityConfig powerQualityConfig = new PowerQualityConfig();
         powerQualityConfig.setId(id);
         powerQualityConfig.setEnable(0);

+ 2 - 6
fiveep-service/src/main/java/com/bizmatics/service/impl/RouteServiceImpl.java

@@ -1,17 +1,13 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Route;
 import com.bizmatics.persistence.mapper.RouteMapper;
 import com.bizmatics.service.RouteService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 暂时未用
  *
  * @author ya
  * @since 2021-07-07

+ 2 - 4
fiveep-service/src/main/java/com/bizmatics/service/impl/SiteDynamicPropertiesServiceImpl.java

@@ -13,9 +13,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 /**
- * <p>
  * 站点动态属性表 服务实现类
- * </p>
  *
  * @author ya
  * @since 2021-09-22
@@ -23,12 +21,12 @@ import java.time.format.DateTimeFormatter;
 @Service
 public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDynamicPropertiesMapper, SiteDynamicProperties> implements SiteDynamicPropertiesService {
     @Override
-    public void siteDynamicPropertiesAdd(SiteDynamicProperties siteDynamicProperties){
+    public void siteDynamicPropertiesAdd(SiteDynamicProperties siteDynamicProperties) {
         this.save(siteDynamicProperties);
     }
 
     @Override
-    public void SiteDynamicPropertiesUpdate(SiteDynamicProperties siteDynamicProperties){
+    public void SiteDynamicPropertiesUpdate(SiteDynamicProperties siteDynamicProperties) {
         this.updateById(siteDynamicProperties);
     }
 }

+ 3 - 5
fiveep-service/src/main/java/com/bizmatics/service/impl/SiteGroupingServiceImpl.java

@@ -11,9 +11,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 站点分组
  *
  * @author ya
  * @since 2021-09-17
@@ -22,7 +20,7 @@ import java.time.LocalDateTime;
 public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMapper, SiteGrouping> implements SiteGroupingService {
 
     @Override
-    public void siteGroupingAdd(String groupingName){
+    public void siteGroupingAdd(String groupingName) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);
@@ -32,7 +30,7 @@ public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMap
     }
 
     @Override
-    public void siteGroupingUpdate(String groupingName,int id){
+    public void siteGroupingUpdate(String groupingName, int id) {
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);
         siteGrouping.setId(id);

+ 7 - 9
fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

@@ -1,11 +1,11 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.WcBlackoutPlanVo;
 import com.bizmatics.persistence.mapper.WcBlackoutPlanMapper;
 import com.bizmatics.service.WcBlackoutPlanService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
@@ -13,9 +13,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
+ * 计划停电
  *
  * @author ya
  * @since 2021-07-07
@@ -24,7 +22,7 @@ import java.util.List;
 public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPlanMapper, WcBlackoutPlan> implements WcBlackoutPlanService {
 
     @Override
-    public void plannedOutageAdd(WcBlackoutPlan wcBlackoutPlan){
+    public void plannedOutageAdd(WcBlackoutPlan wcBlackoutPlan) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         wcBlackoutPlan.setEnable(1);
         wcBlackoutPlan.setCreator(user.getUserName());
@@ -33,12 +31,12 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
     }
 
     @Override
-    public void plannedOutageUpdate(WcBlackoutPlan wcBlackoutPlan){
+    public void plannedOutageUpdate(WcBlackoutPlan wcBlackoutPlan) {
         this.updateById(wcBlackoutPlan);
     }
 
     @Override
-    public void plannedOutageDel(int id){
+    public void plannedOutageDel(int id) {
         WcBlackoutPlan wcBlackoutPlan = new WcBlackoutPlan();
         wcBlackoutPlan.setId(id);
         wcBlackoutPlan.setEnable(0);
@@ -46,8 +44,8 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
     }
 
     @Override
-    public List<WcBlackoutPlanVo> plannedOutageList(String startTime , String endTime , int type,int id){
-        List <WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime,endTime,type,id);
+    public List<WcBlackoutPlanVo> plannedOutageList(String startTime, String endTime, int type, int id) {
+        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, id);
         return plannedOutageList;
     }
 }