Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/CameraDiagnoseMissionController.java

@@ -67,12 +67,35 @@ public class CameraDiagnoseMissionController {
         try {
             diagnoseMissionService.deleteMission(missionId);
         }catch (Exception e){
-            log.error("/diagnoseMission/unbindMission,出现异常：{}",e);
+            log.error("/diagnoseMission/deleteMission,出现异常：{}",e);
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success("操作成功");
+    }
+
+    @ApiOperation("添加诊断任务")
+    @PostMapping({"/addMission"})
+    public AjaxResult addMission(@RequestBody IotDeviceDiagnoseMission request) {
+        try {
+            diagnoseMissionService.addMission(request);
+        }catch (Exception e){
+            log.error("/diagnoseMission/addMission,出现异常：{}",e);
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success("操作成功");
     }
 
+    @ApiOperation("编辑诊断任务")
+    @PostMapping({"/editMission"})
+    public AjaxResult editMission(@RequestBody IotDeviceDiagnoseMission request) {
+        try {
+            diagnoseMissionService.editMission(request);
+        }catch (Exception e){
+            log.error("/diagnoseMission/addMission,出现异常：{}",e);
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success("操作成功");
+    }
 
     @ApiOperation("获取任务下拉框")
     @GetMapping({"/missionTypeList"})

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/DiagnoseMissionService.java

@@ -19,5 +19,9 @@ public interface DiagnoseMissionService {
 
     void deleteMission(String missionId);
 
+    void addMission(IotDeviceDiagnoseMission request);
+
+    void editMission(IotDeviceDiagnoseMission request);
+
     List<AlarmTypeSelectedVO> missionTypeList();
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/DiagnoseMissionServiceImpl.java

@@ -34,8 +34,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
@@ -222,6 +225,62 @@ public class DiagnoseMissionServiceImpl implements DiagnoseMissionService {
     }
 
     @Override
+    public void addMission(IotDeviceDiagnoseMission request){
+        QueryWrapper<IotDeviceDiagnoseMission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", request.getName());
+        List<IotDeviceDiagnoseMission> list = diagnoseMissionChMapper.selectList(queryWrapper);
+        if (list != null && !list.isEmpty()) {
+            String errorMsg = "任务名已存在";
+            throw  new ServiceException(errorMsg);
+        }
+        IotDeviceDiagnoseMission mission = new IotDeviceDiagnoseMission();
+
+        UUID uuid = UUID.randomUUID();
+        mission.setMissionId(uuid.toString());
+        mission.setCreateTime(LocalDateTime.now());
+
+        mission.setName(request.getName());
+        mission.setBeginTime(request.getBeginTime());
+        mission.setEndTime(request.getEndTime());
+        mission.setCycle(request.getCycle());
+        mission.setEnabled(request.getEnabled());
+
+        diagnoseMissionChMapper.insert(mission);
+    }
+
+    @Override
+    public void editMission(IotDeviceDiagnoseMission request){
+        IotDeviceDiagnoseMission bean = diagnoseMissionChMapper.selectById(request.getMissionId());
+        if (bean == null) {
+            String errorMsg = "查询任务实体不存在";
+            throw  new ServiceException(errorMsg);
+        }
+        if (bean.getName().equals("默认") && !bean.getName().equals(request.getName())) {
+            String errorMsg = "默认任务名称不能修改";
+            throw  new ServiceException(errorMsg);
+        }
+
+        QueryWrapper<IotDeviceDiagnoseMission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", request.getName()).ne("mission_id", request.getMissionId());
+        List<IotDeviceDiagnoseMission> list = diagnoseMissionChMapper.selectList(queryWrapper);
+        if (list != null && !list.isEmpty()) {
+            String errorMsg = "任务名已存在";
+            throw  new ServiceException(errorMsg);
+        }
+
+        IotDeviceDiagnoseMission mission = new IotDeviceDiagnoseMission();
+
+        mission.setMissionId(request.getMissionId());
+        mission.setName(request.getName());
+        mission.setBeginTime(request.getBeginTime());
+        mission.setEndTime(request.getEndTime());
+        mission.setCycle(request.getCycle());
+        mission.setEnabled(request.getEnabled());
+
+        diagnoseMissionChMapper.updateById(mission);
+    }
+
+    @Override
     public List<AlarmTypeSelectedVO> missionTypeList() {
         List<AlarmTypeSelectedVO> list = Lists.newArrayList();
         AlarmTypeSelectedVO bean;