Merge branch 'master' of 192.168.100.249:zjm3/jy-equip-refactoring

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

@@ -957,6 +957,20 @@ public class RepairController {
                         }
                     }
                 });
+                if (repairSendBill.getRepairReciveCheckDetail()!=null){
+                    List<Integer> integerList = StringSplitUtil.split(repairSendBill.getRepairReciveCheckDetail());
+                    List<DeviceLibrary> deviceLibraryList = integerList.stream()
+                            .map(integer -> deviceLibraryService.getOne(integer))
+                            .collect(Collectors.toList());
+                    deviceLibraryList.forEach(deviceLibrary -> {
+                        for (RepairDetail r:repairDetails) {
+                            if (r.getDeviceId().equals(deviceLibrary.getId())){
+                                deviceLibrary.setRemark(r.getRemark());
+                            }
+                        }
+                    });
+                    repairBillDetailVo.setReceiveDevices(deviceLibraryList);
+                }
                 repairBillDetailVo.setDeviceLibraries(deviceLibraries);
                 break;
             case 10:
@@ -1009,7 +1023,7 @@ public class RepairController {
             if (!repairDetail.getRepairStatus().equals(RepairStatusEnum.CHANGE_NEW.id)) {
                 orderList.add(repairDetail);
                 if (repairDetail.getRepairStatus().equals(RepairStatusEnum.SCRAPPED.id)) {
-                    if (repairDetail.getNewDeviceDetailId() > 0) {
+                    if (repairDetail.getNewDeviceDetailId()!=null&&repairDetail.getNewDeviceDetailId() > 0) {
                         orderList.add(deviceRepairDetailService.getOne(repairDetail.getNewDeviceDetailId()));
                     }
                 }

dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairBillDetailVo.java

@@ -34,4 +34,7 @@ public class RepairBillDetailVo {
     @ApiModelProperty(name = "装备维修状态列表")
     private List<RepairDetail> repairDetails;
 
+    @ApiModelProperty(name = "接收装备信息")
+    private List<DeviceLibrary> receiveDevices;
+
 }

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

@@ -32,7 +32,6 @@ import java.util.Date;
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update task set delete_tag = 1 where id = ?")
 @Where(clause = "delete_tag = 0")
-@Table(name = "task",schema = "task")
 public class Task {
 
 	@Id

dev-device/device-taskselect/src/main/java/com/tykj/dev/device/taskselect/controller/TaskSelectController.java

@@ -139,6 +139,7 @@ public class TaskSelectController {
                     list.add(deviceLibraryService.getAllotList(new DeviceLibrarySelectVo()).stream().filter(deviceLibraryEntity -> packingIdList.contains(deviceLibraryEntity.getPackingId())).sorted(Comparator.comparing(DeviceLibrary::getPackingId)).collect(Collectors.toList()));
                     return ResponseEntity.ok(new ResultObj(list,"查询成功"));
                 }
+
                 AllotBill allotBillEntity = allotBillService.getOne(billId);
                 if (allotBillEntity.getSendUseraId()!=null) {
                     allotBillEntity.setSenderUserA(userPublicService.getOne(allotBillEntity.getSendUseraId()).getName());
@@ -155,18 +156,6 @@ public class TaskSelectController {
                 list.add(allotBillEntity);
                 String str2 = allotBillEntity.getAllotCheckDetail();
                 List<DeviceLibrary> deviceLibraryEntities = new ArrayList<>();
-                if (str2!=null) {
-                    String[] strings1 = str2.split("x");
-                    for (String s : strings1) {
-                        if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
-                            Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
-                            Integer checkResult = Integer.parseInt(s.substring(s.length() - 1));
-                            DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
-                            deviceLibraryEntity.setCheckResult(checkResult);
-                            deviceLibraryEntities.add(deviceLibraryEntity);
-                        }
-                    }
-                }
                 list.add(deviceLibraryEntities);
                 return ResponseEntity.ok(new ResultObj(list,"查询成功"));
             case 4:

dev-device/device-user/src/main/java/com/tykj/dev/device/user/util/UserUtils.java

@@ -16,7 +16,8 @@ public class UserUtils {
     @Autowired
     private AuthenticationUtils AuthenticationUtils;
 
-    private UnitsService unitsService = SpringUtils.getBean("unitsServiceImpl");
+    @Autowired
+    private UnitsService unitsService;
 
     public Integer getCurrentUserId() {
         SecurityUser authentication = AuthenticationUtils.getAuthentication();

dev-union/src/main/resources/application.properties

@@ -9,15 +9,15 @@ spring.jpa.show-sql=false
 spring.jpa.open-in-view=true
 spring.main.allow-bean-definition-overriding=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=root
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.driver-class-name=com.oscar.Driver
-spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
-#spring.datasource.url=jdbc:mysql://192.168.1.249:3306/management?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
-spring.datasource.username=SYSDBA
-spring.datasource.password=szoscar55
-spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.driver-class-name=com.oscar.Driver
+#spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+spring.datasource.url=jdbc:mysql://192.168.1.249:3306/management?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
+#spring.datasource.username=SYSDBA
+#spring.datasource.password=szoscar55
+#spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 server.servlet.session.timeout=PT1H
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8