现场档案接口添加1

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 设备属性
+ * 设备管理-监控设备
  *
  * @author ya
  * @since 2021-09-24

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

@@ -77,7 +77,7 @@ public class PatrolInspectionSchemeController {
      * @return
      */
     @GetMapping("patrolInspectionSchemeList")
-    public ApiResult<CommonPage<PatrolInspectionScheme>> patrolInspectionSchemeList(@RequestParam(value = "status", required = false, defaultValue = "1") Integer status,
+    public ApiResult<CommonPage<PatrolInspectionScheme>> patrolInspectionSchemeList(@RequestParam(value = "status",required = false, defaultValue = "3") Integer status,
                                                                                     @RequestParam(required = false) String inspectionSchemeName,
                                                                                     @RequestParam(value = "size", required = false, defaultValue = "1") Integer size,
                                                                                     @RequestParam(value = "current", required = false, defaultValue = "15") Integer current

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteArchivesController.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-26
- */
-@Controller
-@RequestMapping("/siteArchives")
-public class SiteArchivesController {
-
-}
-

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

@@ -1,21 +1,68 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.vo.DevopsWorkOrderListVo;
+import com.bizmatics.model.vo.SitedtlArchivesVo;
+import com.bizmatics.model.vo.SitedtlVo;
+import com.bizmatics.service.SitedtlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ * 运维管理-现场档案
  *
  * @author ya
  * @since 2021-10-26
  */
-@Controller
+@RestController
 @RequestMapping("/sitedtl")
 public class SitedtlController {
 
+    @Autowired
+    private SitedtlService sitedtlService;
+
+    /**
+     * 运维管理-现场档案-新增
+     * @param sitedtlArchivesVo
+     * @return
+     */
+    @PostMapping("sitedtlAdd")
+    public ApiResult<Void> sitedtlAdd(@RequestBody SitedtlArchivesVo sitedtlArchivesVo) {
+        sitedtlService.sitedtlAdd(sitedtlArchivesVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 运维管理-现场档案-修改
+     * @param sitedtlArchivesVo
+     * @return
+     */
+    @PostMapping("sitedtlUpdate")
+    public ApiResult<Void> sitedtlUpdate(@RequestBody SitedtlArchivesVo sitedtlArchivesVo) {
+        sitedtlService.sitedtlUpdate(sitedtlArchivesVo);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 运维管理-现场档案-列表查询
+     * @param siteId 站点ID
+     * @param electricTestOverdue 电试日期
+     * @param size 条数
+     * @param current 页数
+     * @return
+     */
+    @GetMapping("sitedtlList")
+    public ApiResult<CommonPage<SitedtlVo>> sitedtlList(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
+                                                                @RequestParam( required = false) String electricTestOverdue,
+                                                                @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
+                                                                @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
+    ) {
+        return ApiResult.success(sitedtlService.sitedtlList(siteId, electricTestOverdue, size, current));
+    }
+
+
 }
 

fiveep-service/src/main/java/com/bizmatics/service/SitedtlService.java

@@ -1,7 +1,10 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.Sitedtl;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.vo.SitedtlArchivesVo;
+import com.bizmatics.model.vo.SitedtlVo;
 
 /**
  * <p>
@@ -12,5 +15,9 @@ import com.bizmatics.common.mvc.base.CrudService;
  * @since 2021-10-26
  */
 public interface SitedtlService extends CrudService<Sitedtl> {
+    void sitedtlAdd(SitedtlArchivesVo sitedtlArchivesVo);
 
+    void sitedtlUpdate(SitedtlArchivesVo sitedtlArchivesVo);
+
+    CommonPage<SitedtlVo> sitedtlList(Integer siteId, String electricTestOverdue, Integer size, Integer current);
 }

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

@@ -171,12 +171,19 @@ public class PatrolInspectionSchemeServiceImpl extends AbstractCrudService<Patro
         if (!inspectionSchemeName.equals("") && !inspectionSchemeName.equals(null)) {
             queryWrapper.like(PatrolInspectionScheme::getInspectionSchemeName, inspectionSchemeName);
         }
-        if (status != 0) {
+        if (status != 3) {
             queryWrapper.eq(PatrolInspectionScheme::getStatus, status);
         }
-        page = this.page(page, queryWrapper);
-        this.ToCommonPage(page);
-        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
+        List<PatrolInspectionScheme> patrolInspectionScheme = this.list(queryWrapper);
+        List<PatrolInspectionScheme> Active1 = new ArrayList<PatrolInspectionScheme>();
+        if (patrolInspectionScheme.size()>0){
+            int currIdx = (current > 1 ? (current -1) * size: 0);
+            for (int i = 0; i < size && i < patrolInspectionScheme.size() - currIdx; i++) { // 判断条件十分巧妙，防止List取值越界
+                PatrolInspectionScheme active = patrolInspectionScheme.get(currIdx + i);
+                Active1.add(active);
+            }
+        }
+        return new CommonPage<>(Active1, patrolInspectionScheme.size(), current,size);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.SiteArchives;
 import com.bizmatics.model.Sitedtl;
@@ -29,6 +30,7 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
     @Autowired
     private SiteArchivesService siteArchivesService;
 
+    @Override
     public void sitedtlAdd(SitedtlArchivesVo sitedtlArchivesVo){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Sitedtl sitedtl = sitedtlArchivesVo.getSitedtl();
@@ -36,6 +38,8 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
         sitedtl.setCreator(user.getUserName());
         sitedtl.setCreateTime(new Date());
         this.save(sitedtl);
+        Integer sitedtlId = sitedtl.getId();
+        siteArchives.setSitedtlId(sitedtlId);
         siteArchivesService.save(siteArchives);
     }
 
@@ -44,8 +48,15 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
         siteArchivesService.updateById(sitedtlArchivesVo.getSiteArchives());
     }
 
-    public List<SitedtlVo> sitedtlList(Integer siteId,String electricTestOverdue,Integer size , Integer Current){
-        List<SitedtlVo> sitedtlList = baseMapper.sitedtlVoList(siteId,electricTestOverdue,Current,size);
-        return null;
+    public CommonPage<SitedtlVo> sitedtlList(Integer siteId,String electricTestOverdue,Integer size , Integer current){
+        List<SitedtlVo> sitedtlList = baseMapper.sitedtlVoList(siteId,electricTestOverdue,null,null);
+        int total = 0;
+        if (sitedtlList.size()>0){
+            total = sitedtlList.size();
+        }
+
+        int startCurrent = (current - 1) * size;
+        List<SitedtlVo> sitedtlListOne = baseMapper.sitedtlVoList(siteId,electricTestOverdue,startCurrent,size);
+        return new CommonPage<>(sitedtlListOne, total, size, current);
     }
 }