修改bug

dev-device/device-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -5,6 +5,7 @@ import com.tykj.dev.device.library.repository.DeviceLogDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.service.DeviceLogService;
 import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.DeviceLogUserVo;
 import com.tykj.dev.device.library.subject.vo.FileVo;
@@ -180,13 +181,16 @@ public class MatchingDeviceController {
     @ApiOperation(value = "查询配套装备详情", notes = "可以通过这个接口查询配套装备详情")
     @GetMapping("/feature/detail/{id}")
     public ResponseEntity getDetail(@PathVariable("id") int id) {
-        MacthingDeviceDetailVo macthingDeviceDetailVo = new MacthingDeviceDetailVo();
+        List<Object> list = new ArrayList<>();
         //添加配套设备详情
         MatchingDeviceLibrary m = matchingDeviceLibraryService.getOne(id);
-        macthingDeviceDetailVo.setMatchingDeviceLibrary(m);
+        list.add(m);
         //添加关联装备详情
         if (m.getDeviceId() != 0) {
-            macthingDeviceDetailVo.setDeviceLibrary(deviceLibraryService.getOne(m.getDeviceId()));
+            list.add(deviceLibraryService.getOne(m.getDeviceId()));
+        }
+        else {
+            list.add(new DeviceLibrary());
         }
         //添加设备履历日志
         List<DeviceLogUserVo> deviceLogs = deviceLogDao.getAllByDeviceIdAndType(id, 1).stream()
@@ -194,8 +198,8 @@ public class MatchingDeviceController {
                 .map(DeviceLogDto::toVo)
                 .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime))
                 .collect(Collectors.toList());
-        macthingDeviceDetailVo.setDeviceLogUserVos(deviceLogs);
-        return ResponseEntity.ok(macthingDeviceDetailVo);
+        list.add(deviceLogs);
+        return ResponseEntity.ok(list);
     }
 
     @ApiOperation(value = "更新配套设备", notes = "可以通过这个接口更新配套设备")
@@ -251,4 +255,16 @@ public class MatchingDeviceController {
         macthingDetailVo.setTaskLogUserVos(taskLogService.getByTaskId(taskBto.getId()));
         return ResponseEntity.ok(macthingDetailVo);
     }
+
+    @ApiOperation(value = "查询所有配套设备型号", notes = "查询所有配套设备型号")
+    @GetMapping(value = "/selectAllModel")
+    public ResponseEntity selectAllModel(){
+        return ResponseEntity.ok(matchingDeviceLibraryService.getAllModel());
+    }
+
+    @ApiOperation(value = "查询所有配套设备名称", notes = "查询所有配套设备名称")
+    @GetMapping(value = "/selectAllName")
+    public ResponseEntity selectAllName(){
+        return ResponseEntity.ok(matchingDeviceLibraryService.getAllName());
+    }
 }

dev-device/device-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingDeviceLibraryDao.java

@@ -4,6 +4,8 @@ import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * @author dengdiyi
  */

dev-device/device-matching/src/main/java/com/tykj/dev/device/matching/service/MatchingDeviceLibraryService.java

@@ -5,6 +5,8 @@ import com.tykj.dev.device.matching.subject.vo.MatchingDeviceSelectVo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * @author dengdiyi
  */
@@ -40,4 +42,14 @@ public interface MatchingDeviceLibraryService {
      * 配套设备分页查询
      */
     Page<MatchingDeviceLibrary> getPage(MatchingDeviceSelectVo matchingDeviceSelectVo, Pageable pageable);
+
+    /**
+     * @return 所有类型
+     */
+    List<String> getAllModel();
+
+    /**
+     * @return 所有名称
+     */
+    List<String> getAllName();
 }

dev-device/device-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -18,8 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -100,6 +99,26 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
         }
     }
 
+    /**
+     * @return 所有类型
+     */
+    @Override
+    public List<String> getAllModel() {
+        Set<String> models = new HashSet<>();
+        matchingDeviceLibraryDao.findAll().forEach(matchingDeviceLibrary -> models.add(matchingDeviceLibrary.getModel()));
+        return new ArrayList<>(models);
+    }
+
+    /**
+     * @return 所有名称
+     */
+    @Override
+    public List<String> getAllName() {
+        Set<String> names = new HashSet<>();
+        matchingDeviceLibraryDao.findAll().forEach(matchingDeviceLibrary -> names.add(matchingDeviceLibrary.getName()));
+        return new ArrayList<>(names);
+    }
+
     /**
      * @param matchingDeviceSelectVo 配套设备查询vo
      * 创建通用查询条件筛选器

dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java

@@ -2,16 +2,17 @@ package com.tykj.dev.device.repair.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.repair.service.RepairBillService;
+import com.tykj.dev.device.repair.subject.domin.RepairBill;
 import com.tykj.dev.device.repair.subject.vo.RepairBillSelectVo;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author dengdiyi
@@ -30,4 +31,13 @@ public class RepairBillSelectController {
     public ResponseEntity selectRepairBill(@RequestBody RepairBillSelectVo repairBillSelectVo) {
         return ResultUtil.success(repairBillService.getPage(repairBillSelectVo, repairBillSelectVo.getPageable()));
     }
+
+    @ApiOperation(value = "查询维修单详情", notes = "可以通过这个接口查询维修单详情")
+    @GetMapping(value = "/archives/repair/detail/{id}")
+    public ResponseEntity selectRepairBillDetail(@PathVariable("id") int id){
+        List<Object> list = new ArrayList<>();
+        //获取维修单
+        RepairBill repairBill = repairBillService.getOne(id);
+        return null;
+    }
 }

dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -176,6 +176,7 @@ public class RepairController {
     @ApiOperation(value = "发起维修审核", notes = "可以通过这个接口发起维修审核")
     @PostMapping(value = "/sendConfirm")
     public ResponseEntity sendConfirm(@RequestBody RepairConfirmVo deviceRepairConfirmVo) {
+        Integer level = userUtils.getCurrentUnitLevel();
         TaskBto taskBto = taskService.get(deviceRepairConfirmVo.getTaskId());
         //获取维修单，送修单，装备详情
         RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
@@ -184,49 +185,69 @@ public class RepairController {
         List<Integer> idList = StringSplitUtil.split(deviceIdDetail);
         //审核成功
         if (deviceRepairConfirmVo.getStatus() == 0) {
-            taskBto.setOwnUnit(userPublicService.findUnitIdByName(repairBill.getReceiveUnit()));
+            if (userUtils.getCurrentUnitLevel()!=1) {
+                taskBto.setOwnUnit(userPublicService.findUnitIdByName(repairBill.getReceiveUnit()));
+            }
             //任务推至下一阶段
-            if (repairSendBill.getRepairUseraId()!=null) {
-                //指定用户
-                taskService.update(taskService.moveToNext(taskBto,repairSendBill.getRepairUseraId()));
+            if (level==1) {
+                if (repairSendBill.getRepairUseraId() != null) {
+                    //指定用户
+                    taskService.update(taskService.moveToNext(taskBto, repairSendBill.getRepairUseraId()));
+                } else {
+                    //不指定用户
+                    taskService.update(taskService.moveToNext(taskBto));
+                }
             }
-            else {
-                //不指定用户
-                taskService.update(taskService.moveToNext(taskBto));
+            //省送国家，任务之间推至维修状态,发起人a的待办
+            else{
+                taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.REPAIRING,repairSendBill.getStartUseraId()));
             }
             //存业务日志
             TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"审核成功并出库",null);
             taskLogService.addLog(taskLogBto);
-//            //如果当前为省，改变装备的所在为中办
-//            if (userUtils.getCurrentUnitLevel()==1){
-//                //获取当前业务维修详情
-//                List<RepairDetail> repairDetailEntities = deviceRepairDetailService.findByBillId(repairBill.getId());
-//                //获取所有父业务id
-//                List<Integer> fathers = StringSplitUtil.taskIdSplit(taskBto.getNodeIdDetail());
-//                fathers.forEach(integer -> {
-//                    //筛选出父业务相同装备的维修详情
-//                    List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
-//                            .filter(repairDetail -> idList.contains(repairDetail.getDeviceId()))
-//                            .collect(Collectors.toList());
-//                    //添加维修详情
-//                    repairDetailEntities.addAll(repairDetails);
-//                });
-//                //改变维修详情装备所在单位为中办
-//                repairDetailEntities.forEach(repairDetail -> {
-//                    repairDetail.setLocationUnit("中办");
-//                    deviceRepairDetailService.update(repairDetail);
-//                });
-//            }
+            //如果当前为省，改变装备的所在为中办
+            if (level==1){
+                //获取当前业务维修详情
+                List<RepairDetail> repairDetailEntities = deviceRepairDetailService.findByBillId(repairBill.getId());
+                //获取所有父业务id
+                List<Integer> fathers = StringSplitUtil.taskIdSplit(taskBto.getNodeIdDetail());
+                fathers.forEach(integer -> {
+                    //筛选出父业务相同装备的维修详情
+                    List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
+                            .filter(repairDetail -> idList.contains(repairDetail.getDeviceId()))
+                            .collect(Collectors.toList());
+                    //添加维修详情
+                    repairDetailEntities.addAll(repairDetails);
+                });
+                //改变维修详情装备所在单位为中办
+                repairDetailEntities.forEach(repairDetail -> {
+                    repairDetail.setLocationUnit("中办");
+                    deviceRepairDetailService.update(repairDetail);
+                });
+            }
             //更新维修单和送修单状态
-            repairBill.setRepairStatus(2);
+            //如果当前为省像国家发起的
+            if (level==1){
+                repairBill.setRepairStatus(4);
+                repairSendBill.setRepairStatus(5);
+            }
+            else {
+                repairBill.setRepairStatus(2);
+                repairSendBill.setRepairStatus(2);
+            }
             deviceRepairBillService.update(repairBill);
-            repairSendBill.setRepairStatus(2);
             deviceRepairSendBillService.update(repairSendBill);
             //修改装备状态，存装备日志
             if (idList.size()>0) {
                 for (Integer id:idList) {
                     DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
-                    deviceLibraryEntity.setLifeStatus(3);
+                    //如果当前为省像国家发起的
+                    if (level==1){
+                        deviceLibraryEntity.setLifeStatus(4);
+                    }
+                    else {
+                        deviceLibraryEntity.setLifeStatus(3);
+                    }
                     deviceLibraryEntity.setManageStatus(0);
                     DeviceLogDto deviceLogDto = new DeviceLogDto(id,"审核成功并出库",null);
                     deviceLogService.addLog(deviceLogDto);
@@ -470,6 +491,8 @@ public class RepairController {
 //    @ApiOperation(value = "送国家维修装备出库",notes = "可以通过这个接口送国家维修装备出库")
 //    @PostMapping(value = "/sendCountry")
 //    public ResponseEntity sendCountry(@RequestBody RepairBillSaveVo repairBillSaveVo){
+//        //获取父任务
+//        TaskBto fatherTask = taskService.get(repairBillSaveVo.getTaskId());
 //        //添加维修单,送修单
 //        RepairBill repairbill= new RepairBill();
 //        RepairSendBill repairSendBill = new RepairSendBill();
@@ -487,55 +510,52 @@ public class RepairController {
 //        String s1 ="NO:第"+calendar.get(Calendar.YEAR)+"PF"+repairBill1.getId()+"号";
 //        repairBill1.setDocNum(s1);
 //        deviceRepairBillService.update(repairBill1);
-//        TaskSaveVo taskSaveVo = new TaskSaveVo();
-//        taskSaveVo.setTitle("维修业务");
-//        taskSaveVo.setBillId(repairBill1.getId());
-//        taskSaveVo.setBillStatus(17);
-//        taskSaveVo.setUserReadDetail("x");
-//        taskSaveVo.setTopFlagDetail("x");
-//        taskSaveVo.setBussinessType(5);
-//        taskSaveVo.setStartUserId(userId);
-//        taskSaveVo.setNodeIdDetail("."+repairBillSaveVo.getTaskId()+".");
-//        taskSaveVo.setParentTaskId(repairBillSaveVo.getTaskId());
-//        TaskEntity taskEntity = taskSaveVo.toDo();
-//        TaskEntity saveEntity = taskService.addEntity(taskEntity);
-//        //添加送修单
+//        //发起维修业务
+//        List<Integer> userIds = new ArrayList<>();
+//        userIds.add(userId);
+//        userIds.add(repairBillSaveVo.getStartUserbId());
+//        TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_SEND_CONFIRM.id,"维修业务",repairBillSaveVo.getTaskId(),fatherTask.getNodeIdDetail()+fatherTask.getId()+".",repairBill1.getId(),5,userUtils.getCurrentUnitId(),1,null,userIds);
+//        Task saveEntity = taskService.start(taskBto);
+//        //存业务日志
+//        List<FileVo> fileVoList = new ArrayList<>();
+//        fileVoList.add(new FileVo("出库确认单",repairBillSaveVo.getFileName(),repairBillSaveVo.getFileUrl()));
+//        TaskLogBto taskLogBto = new TaskLogBto(saveEntity.getId(),"向"+repairBillSaveVo.getReceiveUnit()+"发起装备维修",fileVoList);
+//        taskLogService.addLog(taskLogBto);
 //        repairSendBill.setRepairStatus(0);
 //        repairSendBill.setSendTime(new Date());
 //        StringBuffer stringBuffer = new StringBuffer();
+//        //存维修详情单
 //        for (DeviceDetailVo d:repairBillSaveVo.getDeviceList()) {
 //            stringBuffer.append(d.getDeviceId());
 //            stringBuffer.append("Ǵ");
 //            stringBuffer.append(d.getRemark());
 //            stringBuffer.append("Ǵ");
-//            LogVo bussinessLogVo = new LogVo();
-//            bussinessLogVo.setDeviceId(d.getDeviceId());
-//            bussinessLogVo.setFileDetail("Ǵ"+repairBillSaveVo.getFileName()+"Ǒ"+repairBillSaveVo.getFileUrl()+"Ǒ"+"出库确认单"+"Ǵ");
-//            bussinessLogVo.setRemark("向"+repairBillSaveVo.getReceiveUnit()+"发起装备维修");
-//            bussinessLogVo.setTaskId(saveEntity.getId());
-//            deviceLogService.addLog(bussinessLogVo);
+//            RepairDetail repairDetail = new RepairDetail();
+//            repairDetail.setDeviceId(d.getDeviceId());
+//            DeviceLibrary deviceLibraryEntity =deviceLibraryService.getOne(d.getDeviceId());
+//            repairDetail.setLocationUnit(userUtils.getCurrentUserUnitName());
+//            repairDetail.setModel(deviceLibraryEntity.getModel());
+//            repairDetail.setName(deviceLibraryEntity.getName());
+//            repairDetail.setOwnUnit(deviceLibraryEntity.getOwnUnit());
+//            repairDetail.setRemark(d.getRemark());
+//            repairDetail.setRepairStatus(0);
+//            repairDetail.setRfidSurfaceId(deviceLibraryEntity.getRfidSurfaceId());
+//            repairDetail.setSeqNumber(deviceLibraryEntity.getSeqNumber());
+//            repairDetail.setType(deviceLibraryEntity.getType());
+//            repairDetail.setDeviceRepairBillId(repairBill1.getId());
+//            deviceRepairDetailService.save(repairDetail);
+//            //存装备日志
+//            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(),"向"+repairBillSaveVo.getReceiveUnit()+"发起装备维修",fileVoList);
+//            deviceLogService.addLog(deviceLogDto);
 //        }
+//        //存送修单
 //        repairSendBill.setRepairDeviceDetail(stringBuffer.toString());
 //        repairSendBill.setDeviceRepairBillId(repairBill1.getId());
-//        repairSendBill.setVar1(repairBillSaveVo.getAgent());
+//        repairSendBill.setAgent(repairBillSaveVo.getAgent());
 //        repairSendBill.setTitle("维修业务");
 //        deviceRepairSendBillService.addEntity(repairSendBill);
-//        //发起任务
-//        JobEntity job1 = new JobEntity();
-//        job1.setBelongUserId(userId);
-//        job1.setInvoleUserId("x"+userId+"x");
-//        job1.setIsDone(1);
-//        job1.setBillStatus(16);
-//        job1.setTaskId(saveEntity.getId());
-//        JobEntity job2 = new JobEntity();
-//        job2.setTaskId(saveEntity.getId());
-//        job2.setBelongUserId(repairBillSaveVo.getStartUserBId());
-//        job2.setInvoleUserId(job1.getInvoleUserId()+job2.getBelongUserId()+"x");
-//        job2.setBillStatus(17);
-//        job2.setTaskId(saveEntity.getId());
-//        jobService.addEntity(job1);
-//        jobService.addEntity(job2);
-//        return new ResultObj(saveEntity,"发起维修成功");
+//        myWebSocket.sendMessage1();
+//        return ResponseEntity.ok(saveEntity);
 //    }
 
     @ApiOperation(value = "送国家维修装备出库审核", notes = "可以通过这个接口送国家维修装备出库审核")

dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/bto/TaskLogBto.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.task.subject.domin.TaskLog;
 import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BeanHelper;
 import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,6 +16,7 @@ import org.modelmapper.ModelMapper;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author dengdiyi
@@ -54,13 +56,26 @@ public class TaskLogBto {
         this.fileVoList = new ArrayList<>();
     }
 
+    public TaskLogBto(Integer taskId, String remark, Integer createUserId) {
+        this.taskId = taskId;
+        this.remark = remark;
+        this.createUserId = createUserId;
+    }
+
     /**
      * dto类转化为do类
      */
     public TaskLog toDo() {
+        UserUtils userUtils = SpringUtils.getBean("userUtils");
         TaskLog taskLog = new TaskLog();
         taskLog.setTaskId(this.taskId);
         taskLog.setRemark(this.remark);
+        if (this.createUserId!=null){
+            taskLog.setCreateUserId(this.createUserId);
+        }
+        else {
+            taskLog.setCreateUserId(Objects.requireNonNull(userUtils).getCurrentUserId());
+        }
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("Ǵ");
         if (this.fileVoList != null && this.fileVoList.size() > 0) {

dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/domin/TaskLog.java

@@ -58,7 +58,6 @@ public class TaskLog {
 	* 创建用户id
 	*/
 	@ApiModelProperty(value = "创建用户id")
-	@CreatedBy
 	private Integer createUserId;
 	/**
 	* 创建时间