控制器注释添加和多余代码删除

fiveep-controller/src/main/java/com/bizmatics/controller/web/ConsumeEnergyConfigController.java

@@ -13,10 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * <p>
- * 前端控制器
- * </p>
- *
+ *能源配置
  * @author ya
  * @since 2021-10-13
  */
@@ -27,6 +24,11 @@ public class ConsumeEnergyConfigController {
     @Autowired
     private ConsumeEnergyConfigService consumeEnergyConfigService;
 
+    /**
+     *  能源配置-列表查询
+     * @param siteId
+     * @return
+     */
     @GetMapping("consumeEnergyConfigList")
     public ApiResult<List<ConsumeEnergyConfig>> consumeEnergyConfigList(@RequestParam int siteId) {
         return ApiResult.success(consumeEnergyConfigService.list(siteId));

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -4,22 +4,14 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.DeviceAnalogVariableList;
-import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
-import com.bizmatics.model.vo.DeviceAttributeVo;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-
 /**
- *
  * 设备变量列表
  *
- *
  * @author ya
  * @since 2021-09-24
  */
@@ -32,6 +24,7 @@ public class DeviceAnalogVariableListController {
 
     /**
      * 站点管理-变量列表-新增
+     *
      * @param deviceAnalogVariableList
      * @return
      */
@@ -43,6 +36,7 @@ public class DeviceAnalogVariableListController {
 
     /**
      * 站点管理-变量列表-修改
+     *
      * @param deviceAnalogVariableList
      * @return
      */
@@ -54,6 +48,7 @@ public class DeviceAnalogVariableListController {
 
     /**
      * 站点管理-变量列表-注销
+     *
      * @param id 变量列表主键ID
      * @return
      */
@@ -66,10 +61,11 @@ public class DeviceAnalogVariableListController {
 
     /**
      * 站点管理-变量列表-列表查询
+     *
      * @param deviceCode 设备编号
-     * @param screen 筛选条件
-     * @param size 页数
-     * @param current 条数
+     * @param screen     筛选条件
+     * @param size       页数
+     * @param current    条数
      * @return
      */
 
@@ -78,12 +74,13 @@ public class DeviceAnalogVariableListController {
                                                                         @RequestParam(required = false) String screen,
                                                                         @RequestParam(value = "size", required = false, defaultValue = "1") int size,
                                                                         @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
-        return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen,size,current));
+        return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen, size, current));
     }
 
 
     /**
      * 站点管理-变量列表-列表查询
+     *
      * @param deviceAnalogVariableListVo
      * @return
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.DeviceAttribute;
-import com.bizmatics.model.vo.DeviceAttributeVo;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.service.DeviceAttributeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +11,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- *
  * 设备属性
  *
- *
  * @author ya
  * @since 2021-09-24
  */
@@ -53,8 +50,8 @@ public class DeviceAttributeController {
     /**
      * 站点管理/设备管理-监控设备-设备列表查询
      *
-     * @param id         device_attribute表主键ID
-     * @param siteId     点位ID
+     * @param id     device_attribute表主键ID
+     * @param siteId 点位ID
      * @return
      */
     @GetMapping("deviceNewsList")

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -4,7 +4,9 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.util.DateUtils;
-import com.bizmatics.model.*;
+import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.persistence.mapper.DeviceMapper;
@@ -12,7 +14,6 @@ import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
-import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -162,10 +163,11 @@ public class DeviceController {
 
     /**
      * 设备管理-视频监测-列表查询
-     * @param siteId  站点ID
+     *
+     * @param siteId     站点ID
      * @param deviceName 设备名称
-     * @param size 页数
-     * @param current 条数
+     * @param size       页数
+     * @param current    条数
      * @param deviceType 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他 0：所有
      * @return
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceStatusController.java

@@ -1,26 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import com.bizmatics.model.DeviceStatus;
-import com.bizmatics.service.DeviceStatusService;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 设备状态
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/deviceStatus")
-public class DeviceStatusController {
-
-    @Autowired
-    private DeviceStatusService deviceStatusService;
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/DevopsWorkOrderController.java

@@ -125,6 +125,7 @@ public class DevopsWorkOrderController {
 
     /**
      * 运维管理-工单管理-人员下拉框
+     *
      * @return
      */
     @GetMapping("patrolInspectorsDroplist")
@@ -137,6 +138,7 @@ public class DevopsWorkOrderController {
 
     /**
      * 运维管理-工单管理-团队人员下拉框
+     *
      * @return
      */
     @GetMapping("PatrolInspectionTeamList")
@@ -146,7 +148,11 @@ public class DevopsWorkOrderController {
         return ApiResult.success(devopsWorkOrderService.PatrolInspectionTeamList());
     }
 
-
+    /**
+     * 运维管理-运维统计
+     * @param type
+     * @return
+     */
     @GetMapping("operationCensus")
     public ApiResult<List<OpexStatisticsVo>> operationCensus(@RequestParam String type
     ) {

fiveep-controller/src/main/java/com/bizmatics/controller/web/FacilityController.java

@@ -4,7 +4,6 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.FacilityService;
 import com.bizmatics.service.vo.FacilityCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -14,6 +13,7 @@ import java.util.List;
 
 /**
  * object
+ *
  * @author yq
  * @date 2021/7/12 9:09
  */
@@ -27,11 +27,12 @@ public class FacilityController {
 
     /**
      * 查询不同设备的数量
+     *
      * @param siteId
      * @return
      */
     @GetMapping("count")
-    public ApiResult<List<FacilityCountVO>> getCount(@RequestParam Integer siteId){
+    public ApiResult<List<FacilityCountVO>> getCount(@RequestParam Integer siteId) {
         return ApiResult.success(facilityService.getCount(siteId));
     }
 }

fiveep-controller/src/main/java/com/bizmatics/controller/web/HadSiteStaticController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-20
- */
-@Controller
-@RequestMapping("/hadSiteStatic")
-public class HadSiteStaticController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolCheckEntryController.java

@@ -13,8 +13,6 @@ import java.util.List;
 /**
  * 巡检管理-检查条目
  *
- *
- *
  * @author ya
  * @since 2021-10-15
  */
@@ -88,6 +86,7 @@ public class PatrolCheckEntryController {
 
     /**
      * 巡检管理-检查条目-检查项-下拉框
+     *
      * @param deviceTypeId
      * @return
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolContentEntryController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-10-16
- */
-@Controller
-@RequestMapping("/patrolContentEntry")
-public class PatrolContentEntryController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolDeviceTypeController.java

@@ -14,6 +14,7 @@ import java.util.List;
 
 /**
  * 巡检管理-检查条目-检查条目设备类型
+ *
  * @author ya
  * @since 2021-10-15
  */
@@ -25,7 +26,8 @@ public class PatrolDeviceTypeController {
     private PatrolDeviceTypeService patrolDeviceTypeService;
 
     /**
-     *巡检管理-检查条目-检查条目设备类型-新增
+     * 巡检管理-检查条目-检查条目设备类型-新增
+     *
      * @param deviceTypeName 设备类型名称
      * @return
      */
@@ -37,8 +39,9 @@ public class PatrolDeviceTypeController {
     }
 
     /**
-     *巡检管理-检查条目-检查条目设备类型-修改
-     * @param id 检查条目设备类型id
+     * 巡检管理-检查条目-检查条目设备类型-修改
+     *
+     * @param id             检查条目设备类型id
      * @param deviceTypeName 设备类型名称
      * @return
      */
@@ -51,7 +54,8 @@ public class PatrolDeviceTypeController {
     }
 
     /**
-     *巡检管理-检查条目-检查条目设备类型-注销
+     * 巡检管理-检查条目-检查条目设备类型-注销
+     *
      * @param id 检查条目设备类型id
      * @return
      */
@@ -63,16 +67,17 @@ public class PatrolDeviceTypeController {
     }
 
     /**
-     *巡检管理-检查条目-检查条目设备类型-检查条目设备类型查询
+     * 巡检管理-检查条目-检查条目设备类型-检查条目设备类型查询
+     *
      * @param deviceTypeName 设备类型名称
-     * @param id  检查条目设备类型ID
+     * @param id             检查条目设备类型ID
      * @return
      */
     @GetMapping("patrolDeviceTypeList")
     public ApiResult<List<PatrolDeviceListVO>> patrolDeviceTypeList(@RequestParam(required = false) String deviceTypeName,
                                                                     @RequestParam(value = "id", required = false, defaultValue = "0") Integer id
     ) {
-        return ApiResult.success(patrolDeviceTypeService.patrolDeviceTypeList(deviceTypeName,id));
+        return ApiResult.success(patrolDeviceTypeService.patrolDeviceTypeList(deviceTypeName, id));
     }
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionDeviceController.java

@@ -86,18 +86,18 @@ public class PatrolInspectionDeviceController {
 
 
     /**
-     *  通用图片上传
-     * @param file 图片
+     * 通用图片上传
+     *
+     * @param file    图片
      * @param request
      * @return
      */
     @PostMapping("pictureUpload")
-    public ApiResult<String> pictureUpload(@RequestParam(value="file",required=false)MultipartFile file, HttpServletRequest request
+    public ApiResult<String> pictureUpload(@RequestParam(value = "file", required = false) MultipartFile file, HttpServletRequest request
     ) {
-        return ApiResult.success(patrolInspectionDeviceService.pictureUpload(file,request));
+        return ApiResult.success(patrolInspectionDeviceService.pictureUpload(file, request));
     }
 
 
-
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectionTeamController.java

@@ -1,14 +1,11 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ * 团队管理-未开发
  *
  * @author ya
  * @since 2021-10-18

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolInspectorsController.java

@@ -1,14 +1,11 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ * 人员管理-未开发
  *
  * @author ya
  * @since 2021-10-18

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolManufacturerController.java

@@ -1,14 +1,11 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ * 厂家管理-未开发
  *
  * @author ya
  * @since 2021-10-15

fiveep-controller/src/main/java/com/bizmatics/controller/web/RouteController.java

@@ -1,26 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import com.bizmatics.service.RouteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 线路表
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/route")
-public class RouteController {
-
-
-    @Autowired
-    private RouteService routeService;
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteDynamicPropertiesController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 站点动态属性表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-09-22
- */
-@Controller
-@RequestMapping("/siteDynamicProperties")
-public class SiteDynamicPropertiesController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteObjectController.java

@@ -1,13 +0,0 @@
-package com.bizmatics.controller.web;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author yq
- * @date 2021/7/12 9:09
- */
-@RestController
-@RequestMapping("siteObject")
-public class SiteObjectController {
-}

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteTypeController.java

@@ -1,21 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-09-22
- */
-@Controller
-@RequestMapping("/siteType")
-public class SiteTypeController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/SitedtlController.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 站点详情
+ * 现场档案-未开发
  * @author ya
  * @since 2021-07-07
  */

fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsWorkOrderServiceImpl.java

@@ -11,8 +11,6 @@ import com.bizmatics.model.vo.*;
 import com.bizmatics.persistence.mapper.DevopsWorkOrderMapper;
 import com.bizmatics.service.*;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.CommonIcoVO;
-import org.junit.jupiter.api.Order;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -462,7 +460,7 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
         //工作状态
         QueryWrapper<DevopsWorkOrder> queryWrapperTwo = new QueryWrapper<>();
         queryWrapperTwo.select("work_order_status", "count(*) as count")
-                .eq("status",1)
+                .eq("status", 1)
                 .between("create_time", startTime, endTime)
                 .groupBy("work_order_status");
 
@@ -493,16 +491,16 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
 
         //各站点各类工单数统计
         QueryWrapper<DevopsWorkOrder> queryWrapperThree = new QueryWrapper<>();
-        queryWrapperThree.select("site_id","work_order_type", "count(*) as count")
-                .eq("status",1)
+        queryWrapperThree.select("site_id", "work_order_type", "count(*) as count")
+                .eq("status", 1)
                 .between("create_time", startTime, endTime)
-                .groupBy("site_id","work_order_type");
+                .groupBy("site_id", "work_order_type");
         List<DevopsWorkOrder> WorkOrderStatisticsList = this.list(queryWrapperThree);
         List<Object> workOrderStatistics = new ArrayList<>();
         List<Site> siteList = baseMapper.SiteList(user.getUserId().intValue(), null);
-        if (siteList.size()>0){
-            for (int i=0;i<siteList.size();i++){
-                Map<String,Object> map = new HashMap<>();
+        if (siteList.size() > 0) {
+            for (int i = 0; i < siteList.size(); i++) {
+                Map<String, Object> map = new HashMap<>();
                 Integer safetyValuationCount = 0;
                 Integer overhaulCount = 0;
                 Integer rushRepairCount = 0;
@@ -510,65 +508,64 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
                 Integer maintainCount = 0;
                 Integer outageMaintenanceCount = 0;
                 Integer inspectionCount = 0;
-                if (WorkOrderStatisticsList.size()>0){
-                    for (int j=0;j<WorkOrderStatisticsList.size();j++){
-                        if (siteList.get(i).getId()==WorkOrderStatisticsList.get(j).getSiteId()){
+                if (WorkOrderStatisticsList.size() > 0) {
+                    for (int j = 0; j < WorkOrderStatisticsList.size(); j++) {
+                        if (siteList.get(i).getId() == WorkOrderStatisticsList.get(j).getSiteId()) {
                             switch (WorkOrderStatisticsList.get(j).getWorkOrderType()) {
                                 case 1:
                                     safetyValuationCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 2:
-                                    overhaulCount= WorkOrderStatisticsList.get(j).getCount();
+                                    overhaulCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 3:
-                                    rushRepairCount= WorkOrderStatisticsList.get(j).getCount();
+                                    rushRepairCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 4:
-                                    otherCount= WorkOrderStatisticsList.get(j).getCount();
+                                    otherCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 5:
-                                    maintainCount= WorkOrderStatisticsList.get(j).getCount();
+                                    maintainCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 6:
-                                    outageMaintenanceCount= WorkOrderStatisticsList.get(j).getCount();
+                                    outageMaintenanceCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 case 7:
-                                    inspectionCount= WorkOrderStatisticsList.get(j).getCount();
+                                    inspectionCount = WorkOrderStatisticsList.get(j).getCount();
                                     break;
                                 default:
                             }
                         }
-                        map.put("siteName",siteList.get(i).getSiteName());
-                        map.put("safetyValuationCount",safetyValuationCount);
-                        map.put("overhaulCount",overhaulCount);
-                        map.put("rushRepairCount",rushRepairCount);
-                        map.put("otherCount",otherCount);
-                        map.put("maintainCount",maintainCount);
-                        map.put("outageMaintenanceCount",outageMaintenanceCount);
-                        map.put("inspectionCount",inspectionCount);
+                        map.put("siteName", siteList.get(i).getSiteName());
+                        map.put("safetyValuationCount", safetyValuationCount);
+                        map.put("overhaulCount", overhaulCount);
+                        map.put("rushRepairCount", rushRepairCount);
+                        map.put("otherCount", otherCount);
+                        map.put("maintainCount", maintainCount);
+                        map.put("outageMaintenanceCount", outageMaintenanceCount);
+                        map.put("inspectionCount", inspectionCount);
                     }
-                }else {
-                    map.put("siteName",siteList.get(i).getSiteName());
-                    map.put("safetyValuationCount",safetyValuationCount);
-                    map.put("overhaulCount",overhaulCount);
-                    map.put("rushRepairCount",rushRepairCount);
-                    map.put("otherCount",otherCount);
-                    map.put("maintainCount",maintainCount);
-                    map.put("outageMaintenanceCount",outageMaintenanceCount);
-                    map.put("inspectionCount",inspectionCount);
+                } else {
+                    map.put("siteName", siteList.get(i).getSiteName());
+                    map.put("safetyValuationCount", safetyValuationCount);
+                    map.put("overhaulCount", overhaulCount);
+                    map.put("rushRepairCount", rushRepairCount);
+                    map.put("otherCount", otherCount);
+                    map.put("maintainCount", maintainCount);
+                    map.put("outageMaintenanceCount", outageMaintenanceCount);
+                    map.put("inspectionCount", inspectionCount);
                 }
                 workOrderStatistics.add(map);
             }
         }
 
 
-
         //工单数趋势
         QueryWrapper<DevopsWorkOrder> queryWrapperFour = new QueryWrapper<>();
         queryWrapperFour.select("FROM_UNIXTIME(UNIX_TIMESTAMP(create_time) , '%Y-%m-%d') as create_time", "count(*) as count")
-                .eq("status",1)
+                .eq("status", 1)
                 .between("create_time", startTime, endTime)
-                .groupBy("site_id","work_order_type");
+                .groupBy("site_id", "work_order_type");
         List<DevopsWorkOrder> workOrderTrend = this.list(queryWrapperFour);
 
         List<OpexStatisticsVo> list = new ArrayList<>();

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

@@ -20,7 +20,7 @@ import java.util.UUID;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ya
@@ -30,7 +30,7 @@ import java.util.UUID;
 public class PatrolInspectionDeviceServiceImpl extends AbstractCrudService<PatrolInspectionDeviceMapper, PatrolInspectionDevice> implements PatrolInspectionDeviceService {
 
     @Override
-    public void patrolInspectionDeviceAdd(String inspectionDeviceName,Integer siteId,Integer deviceTypeId){
+    public void patrolInspectionDeviceAdd(String inspectionDeviceName, Integer siteId, Integer deviceTypeId) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         PatrolInspectionDevice patrolInspectionDevice = new PatrolInspectionDevice();
         patrolInspectionDevice.setInspectionDeviceName(inspectionDeviceName);
@@ -44,12 +44,12 @@ public class PatrolInspectionDeviceServiceImpl extends AbstractCrudService<Patro
     }
 
     @Override
-    public void patrolInspectionDeviceUpdate(PatrolInspectionDevice patrolInspectionDevice){
+    public void patrolInspectionDeviceUpdate(PatrolInspectionDevice patrolInspectionDevice) {
         this.updateById(patrolInspectionDevice);
     }
 
     @Override
-    public void patrolInspectionDeviceDel(Integer id){
+    public void patrolInspectionDeviceDel(Integer id) {
         PatrolInspectionDevice patrolInspectionDevice = new PatrolInspectionDevice();
         patrolInspectionDevice.setId(id);
         patrolInspectionDevice.setStatus(0);
@@ -57,14 +57,14 @@ public class PatrolInspectionDeviceServiceImpl extends AbstractCrudService<Patro
     }
 
     @Override
-    public List<PatrolInspectionDeviceVo> patrolInspectionDeviceList(String inspectionDeviceName,Integer siteId,Integer id){
-        List<PatrolInspectionDeviceVo> patrolInspectionDeviceList = baseMapper.patrolInspectionDeviceList(inspectionDeviceName,siteId,id);
+    public List<PatrolInspectionDeviceVo> patrolInspectionDeviceList(String inspectionDeviceName, Integer siteId, Integer id) {
+        List<PatrolInspectionDeviceVo> patrolInspectionDeviceList = baseMapper.patrolInspectionDeviceList(inspectionDeviceName, siteId, id);
         return patrolInspectionDeviceList;
     }
 
 
     @Override
-    public String pictureUpload(@NotNull MultipartFile file, HttpServletRequest request){
+    public String pictureUpload(@NotNull MultipartFile file, HttpServletRequest request) {
         if (file.isEmpty()) {
             System.out.println("文件为空空");
         }
@@ -74,7 +74,7 @@ public class PatrolInspectionDeviceServiceImpl extends AbstractCrudService<Patro
 //        String filePath = "D://temp-rainy//"; // 上传后的路径
         fileName = UUID.randomUUID() + suffixName; // 新文件名
 
-        String destFileName = request.getServletContext().getRealPath("") + "uploaded" + File.separator+fileName;
+        String destFileName = request.getServletContext().getRealPath("") + "uploaded" + File.separator + fileName;
         File dest = new File(destFileName);
 //        File dest = new File(filePath + fileName);
         if (!dest.getParentFile().exists()) {