5-20 提交保养相关接口

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java

@@ -1,5 +1,9 @@
 package com.glxp.api.controller.dev;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
@@ -7,13 +11,13 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
-import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
-import com.glxp.api.req.dev.DeviceCheckDetailParam;
+import com.glxp.api.req.dev.*;
-import com.glxp.api.req.dev.DeviceCheckDetailQuery;
-import com.glxp.api.req.dev.DeviceCheckDetailRepairParam;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.dev.DeviceCheckDetailItemService;
 import com.glxp.api.service.dev.DeviceCheckDetailService;
+import com.glxp.api.vo.dev.DeviceCheckDetailVo;
+import com.glxp.api.vo.dev.DeviceUpkeepDetailVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -76,4 +80,5 @@ public class DeviceCheckDetailController extends BaseController {
     }
 
 
+
 }

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java

@@ -6,12 +6,13 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairEntity;
+import com.glxp.api.req.dev.DeviceCheckQuery;
+import com.glxp.api.req.dev.DeviceRepairQuery;
 import com.glxp.api.req.dev.DeviceUpkeepQuery;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.dev.DeviceUpkeepService;
-import com.glxp.api.vo.dev.DeviceCheckPrintVo;
+import com.glxp.api.vo.dev.*;
-import com.glxp.api.vo.dev.DeviceUpkeepPrintVo;
-import com.glxp.api.vo.dev.DeviceUpkeepVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -44,23 +45,23 @@ public class DeviceUpkeepController extends BaseController {
     }
 
     /**
-     * 本部门巡检任务单列表
+     * 本部门任务单列表
      *
      * @param query
      * @return
 //     */
-//    @AuthRuleAnnotation("")
+    @AuthRuleAnnotation("")
-//    @PostMapping("/udi/device/check/pageByDept")
+    @PostMapping("/udi/device/upkeep/pageByDept")
-//    public BaseResponse pageByDept(@RequestBody DeviceCheckQuery query) {
+    public BaseResponse pageByDept(@RequestBody DeviceUpkeepQuery query) {
-//        AuthAdmin user = super.getUser();
+        AuthAdmin user = super.getUser();
-//        query.setChargeDeptCode(user.getLocDeptCode());
+        query.setChargeDeptCode(user.getLocDeptCode());
-//        List<DeviceCheckVo> list = deviceCheckService.pageList(query);
+        List<DeviceUpkeepVo> list = deviceUpkeepService.pageList(query);
-//        PageInfo pageInfo = new PageInfo<>(list);
+        PageInfo pageInfo = new PageInfo<>(list);
-//        PageSimpleResponse page = new PageSimpleResponse();
+        PageSimpleResponse page = new PageSimpleResponse();
-//        page.setTotal(pageInfo.getTotal());
+        page.setTotal(pageInfo.getTotal());
-//        page.setList(pageInfo.getList());
+        page.setList(pageInfo.getList());
-//        return ResultVOUtils.success(page);
+        return ResultVOUtils.success(page);
-//    }
+    }
 
     /**
      * 根据计划id生成巡检任务单
@@ -90,4 +91,24 @@ public class DeviceUpkeepController extends BaseController {
         return ResultVOUtils.success(vo);
     }
 
+
+    /**
+     * 我的维修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/byUser/page")
+    public BaseResponse pageByUser(@RequestBody DeviceUpkeepQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setChargeDeptCode(user.getLocDeptCode());
+        List<DeviceUpkeepDetailVo> list = deviceUpkeepService.pageListDetail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
 }

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java

@@ -79,7 +79,19 @@ public class DeviceUpkeepDetailController extends BaseController {
         return ResultVOUtils.success(entity);
     }
 
-
+    /**
+     * 完成保养任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/finish")
+    public BaseResponse finish(@RequestBody @Valid DeviceUpkeepDetailParam param) {
+        AuthAdmin user = super.getUser();
+        deviceUpkeepDetailItemService.finishAll(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
 
 
 

src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java

@@ -3,11 +3,17 @@ package com.glxp.api.dao.dev;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.req.dev.CheckDetailQuery;
+import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery;
+import com.glxp.api.vo.dev.DeviceCheckDetailVo;
+
+import java.util.List;
 
 /**
 *  针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper
 */
 public interface DeviceCheckDetailMapper extends BaseMapperPlus<DeviceCheckDetailMapper, DeviceCheckDetailEntity,DeviceCheckDetailEntity> {
+    List<DeviceCheckDetailVo> pageListDetail(CheckDetailQuery query);
 }
 
 

src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java

@@ -6,6 +6,7 @@ import com.glxp.api.entity.dev.DeviceUpkeepEntity;
 import com.glxp.api.req.dev.DeviceCheckQuery;
 import com.glxp.api.req.dev.DeviceUpkeepQuery;
 import com.glxp.api.vo.dev.DeviceCheckVo;
+import com.glxp.api.vo.dev.DeviceUpkeepDetailVo;
 import com.glxp.api.vo.dev.DeviceUpkeepVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,6 +21,8 @@ public interface DeviceUpkeepMapper extends BaseMapperPlus<DeviceUpkeepMapper, D
 
 
     DeviceUpkeepVo getVoById(@Param("taskId") Long taskId);
+
+    List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query);
 }
 
 

src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java

@@ -0,0 +1,14 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class CheckDetailQuery extends ListPageRequest {
+
+    private String deviceCode;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java

@@ -86,6 +86,7 @@ public class DeviceRepairApplyAddParam {
                 .applyUserId(user.getId())
                 .applyUserName(user.getEmployeeName())
                 .applyUserPhone(this.applyUserPhone)
+                .confirmUserId(user.getId())
                 .applyTime(LocalDateTime.now())
                 .deviceCount(details.size())
                 .finishCount(0)

src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java

@@ -16,7 +16,7 @@ public class DeviceUpkeepDetailItemQuery extends ListPageRequest {
     /**
      * 设备标识
      */
-    @NotBlank(message = "设备标识不能为空")
+//    @NotBlank(message = "设备标识不能为空")
     private String deviceCode;
 
 

src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java

@@ -0,0 +1,35 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class DeviceUpkeepDetailParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备编码不能为空")
+    private String deviceCode;
+
+    /**
+     * 保养建议
+     */
+    private String suggestion;
+
+    /**
+     * 现场照片
+     */
+    private String livePath;
+    /**
+     * 正常标识
+     */
+    private Boolean normalFlag;
+
+    private List<DeviceUpkeepDetailItemEntity> detailItemEntities;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceUpkeepQuery.java

@@ -8,6 +8,7 @@ public class DeviceUpkeepQuery extends ListPageRequest {
 
     String taskId;
     String chargeDeptCode;
+    String deviceCode;
     Boolean finishFlag;
 
 }

src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java

@@ -19,4 +19,6 @@ public interface DeviceUpkeepDetailItemService extends IService<DeviceUpkeepDeta
     List<DeviceUpkeepDetailItemEntity> pageList(DeviceUpkeepDetailItemQuery query);
 
     void finish(DeviceUpkeepDetailItemFinishParam param, AuthAdmin user);
+
+    void finishAll(DeviceUpkeepDetailParam param, AuthAdmin user);
 }

src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceUpkeepEntity;
 import com.glxp.api.req.dev.DeviceUpkeepQuery;
-import com.glxp.api.vo.dev.DeviceCheckPrintVo;
+import com.glxp.api.vo.dev.*;
-import com.glxp.api.vo.dev.DeviceCheckVo;
-import com.glxp.api.vo.dev.DeviceUpkeepPrintVo;
-import com.glxp.api.vo.dev.DeviceUpkeepVo;
 
 import java.util.List;
 
@@ -32,6 +29,8 @@ public interface DeviceUpkeepService extends IService<DeviceUpkeepEntity> {
 
     void finishUpkeep(Long taskId, String deviceCode);
 
+    List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query);
+
     /**
      * 完成一个保养设备
      *

src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java

@@ -1,14 +1,19 @@
 package com.glxp.api.service.dev.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.dao.dev.DeviceCheckDetailMapper;
 import com.glxp.api.dao.dev.DeviceUpkeepDetailItemMapper;
+import com.glxp.api.dao.dev.DeviceUpkeepDetailMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.*;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam;
 import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam;
 import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery;
+import com.glxp.api.req.dev.DeviceUpkeepDetailParam;
 import com.glxp.api.service.dev.DeviceUpkeepDetailItemService;
 import com.glxp.api.service.dev.DeviceUpkeepDetailService;
 import com.glxp.api.service.dev.DeviceUpkeepService;
@@ -34,6 +39,8 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl<DeviceUpkeepD
     DeviceUpkeepService deviceUpkeepService;
     @Resource
     DeviceUpkeepDetailService deviceUpkeepDetailService;
+    @Resource
+    DeviceUpkeepDetailMapper deviceUpkeepDetailMapper;
 
 
     @Override
@@ -50,7 +57,7 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl<DeviceUpkeepD
     public List<DeviceUpkeepDetailItemEntity> pageList(DeviceUpkeepDetailItemQuery query) {
         List<DeviceUpkeepDetailItemEntity> list = super.list(Wrappers.lambdaQuery(DeviceUpkeepDetailItemEntity.class)
                 .eq(DeviceUpkeepDetailItemEntity::getTaskId, query.getTaskId())
-                .eq(DeviceUpkeepDetailItemEntity::getDeviceCode, query.getDeviceCode())
+                .eq(query.getDeviceCode()!=null,DeviceUpkeepDetailItemEntity::getDeviceCode, query.getDeviceCode())
                 .orderByAsc(DeviceUpkeepDetailItemEntity::getFinishFlag, DeviceUpkeepDetailItemEntity::getNormalFlag, DeviceUpkeepDetailItemEntity::getDeviceCode, DeviceUpkeepDetailItemEntity::getItemCode)
         );
 
@@ -91,6 +98,49 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl<DeviceUpkeepD
             throw new JsonException("操作失败，该项目可能已经被其他人完成，请刷新重试");
         }
     }
+
+    @Override
+    public void finishAll(DeviceUpkeepDetailParam param, AuthAdmin user) {
+        int finishCount = 0;
+        int exceptionCount = 0;
+        int itemCount = 0;
+        if (CollUtil.isNotEmpty(param.getDetailItemEntities())) {
+            for (DeviceUpkeepDetailItemEntity itemEntity : param.getDetailItemEntities()) {
+                if (!IntUtil.value(itemEntity.getNormalFlag())) {
+                    exceptionCount++;
+                }
+                finishCount++;
+                itemCount++;
+                finish(DeviceUpkeepDetailItemFinishParam.builder()
+                        .taskId(param.getTaskId())
+                        .deviceCode(param.getDeviceCode())
+                        .itemCode(itemEntity.getItemCode())
+                        .normalFlag(itemEntity.getNormalFlag())
+                        .suggestion("")
+                        .build(), user);
+            }
+        }
+//        log.error("修改语句");
+        int update = deviceUpkeepDetailMapper.update(DeviceUpkeepDetailEntity.builder()
+                        .finishFlag(true)
+                        .finishCount(finishCount)
+                        .suggestion(param.getSuggestion())
+                        .livePath(param.getLivePath())
+                        .normalFlag(param.getNormalFlag())
+                        .finishTime(LocalDateTime.now())
+                        .updateTime(LocalDateTime.now())
+                        .exceptionCount(exceptionCount).itemCount(itemCount).build(),
+                Wrappers.lambdaUpdate(DeviceUpkeepDetailEntity.class)
+                        .eq(DeviceUpkeepDetailEntity::getTaskId, param.getTaskId())
+                        .eq(DeviceUpkeepDetailEntity::getDeviceCode, param.getDeviceCode())
+        );
+        if (update<1){
+
+            throw new JsonException(ResultEnum.NOT_NETWORK,"修改失败");
+        }
+
+    }
+
 }
 
 

src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java

@@ -195,7 +195,7 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
     public void finishUpkeep(Long taskId, String deviceCode) {
         boolean updated = super.update(Wrappers.lambdaUpdate(DeviceUpkeepEntity.class)
                 .setSql("finishCount = finishCount + 1")
-                .setSql(String.format("exceptionCount = exceptionCount + (select exceptionCount>0 from device_check_detail where taskId = %s and deviceCode = '%s')", taskId, deviceCode))
+                .setSql(String.format("exceptionCount = exceptionCount + (select exceptionCount>0 from device_upkeep_detail where taskId = %s and deviceCode = '%s')", taskId, deviceCode))
                 .eq(DeviceUpkeepEntity::getTaskId, taskId)
                 .last("and finishCount+1 <= deviceCount")
         );
@@ -211,7 +211,14 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
         }
     }
 
-
+    @Override
+    public List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query) {
+        if (query.getPage() != null){
+            PageHelper.startPage(query.getPage(),query.getLimit());
+        }
+        List<DeviceUpkeepDetailVo> list = super.baseMapper.pageListDetail(query);
+        return list;
+    }
 
 
 }

src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java

@@ -0,0 +1,21 @@
+package com.glxp.api.vo.dev;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class DeviceCheckDetailVo {
+
+    String deviceCode;
+    String productName;
+    Integer itemCount;
+    Integer normalFlag;
+    Integer finishCount;
+    Integer exceptionCount;
+    String itemName;
+    String suggestion;
+
+
+
+
+}

src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java

@@ -0,0 +1,20 @@
+package com.glxp.api.vo.dev;
+
+import com.glxp.api.entity.dev.DeviceUpkeepEntity;
+import lombok.Data;
+
+@Data
+public class DeviceUpkeepDetailVo  {
+
+    String deviceCode;
+    String deptName;
+    Boolean finishFlag;
+    String manufactory;
+    Integer itemCount;
+    Integer exceptionCount;
+    Integer finishCount;
+    Integer deviceCount;
+    String createUserName;
+
+
+}

src/main/resources/mybatis/mapper/dev/DeviceCheckDetailMapper.xml

@@ -3,4 +3,13 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.dev.DeviceCheckDetailMapper">
+
+    <select id="pageListDetail" resultType="com.glxp.api.vo.dev.DeviceCheckDetailVo">
+        select dcd.deviceCode deviceCode,productName,itemCount,dcd.exceptionCount exceptionCount,dcd.finishCount finishCount,dcd.normalFlag normalFlag,dcd.suggestion suggestion,
+               itemName
+        from device_check_detail dcd
+                 left join device_check_detail_item dcdi on dcd.deviceCode = dcdi.deviceCode
+                 left join device_check dc on dcd.taskId = dc.taskId
+        where dcd.deviceCode = #{deviceCode}
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/dev/DeviceUpkeepMapper.xml

@@ -49,4 +49,12 @@
                          left join auth_dept d on d.code = u.chargeDeptCode
                 where u.taskId = #{taskId}
     </select>
+    <select id="pageListDetail" resultType="com.glxp.api.vo.dev.DeviceUpkeepDetailVo">
+        select dud.deviceCode deviceCode,dud.deptName deptName,dud.finishFlag finishFlag,dud.manufactory manufactory, itemCount,dud.exceptionCount exceptionCount,dud.finishCount finishCount,
+                createUserName,deviceCount
+            from device_upkeep_detail dud
+            left join device_upkeep du on dud.taskId = du.taskId
+            left join device_upkeep_detail_item dudi on dud.taskId = dudi.taskId
+            where dud.deviceCode = #{deviceCode}
+    </select>
 </mapper>