Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DeviceHttpController.java

@@ -3,6 +3,7 @@ package com.usky.park.controller.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -211,30 +212,23 @@ public class DeviceHttpController {
                 String company_code = data.get(i).get("company_code").toString();
 
 
-                if(flag == -1 || flag == 0){
-                    LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
-                    queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+                if(flag == -1){
+                    LambdaUpdateWrapper<DmpDevice> updateWrapper = Wrappers.lambdaUpdate();
+                    updateWrapper.set(DmpDevice::getDeviceId,device_id)
+                            .set(DmpDevice::getProductId,product_id)
+                            .set(DmpDevice::getUpdatedTime,LocalDateTime.now())
+                            .set(DmpDevice::getDeleteFlag,1)
                             .eq(DmpDevice::getDeviceCode,device_code);
-                    List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
+                    dmpDeviceService.update(updateWrapper);
 
-                    if(CollectionUtils.isNotEmpty(list)){
-                        DmpDevice dmpDevice = new DmpDevice();
-                        dmpDevice.setId(list.get(0).getId());
-                        dmpDevice.setDeviceId(device_id);
-                        dmpDevice.setDeviceCode(device_code);
-                        dmpDevice.setDeviceName(device_name);
-                        dmpDevice.setDeviceType(deviceType);
-                        dmpDevice.setProductId(Integer.parseInt(product_id));
-                        dmpDevice.setCompanyCode(company_code);
-                        dmpDevice.setUpdatedTime(LocalDateTime.now());
-                        if(flag == -1){
-                            dmpDevice.setDeviceName(list.get(0).getDeviceName());
-                            dmpDevice.setDeleteFlag(1);
-                            dmpDeviceService.updateById(dmpDevice);
-                        }else if(flag == 0){
-                            dmpDeviceService.updateById(dmpDevice);
-                        }
-                    }
+                }else if(flag == 0){
+                    LambdaUpdateWrapper<DmpDevice> updateWrapper = Wrappers.lambdaUpdate();
+                    updateWrapper.set(DmpDevice::getDeviceId,device_id)
+                            .set(DmpDevice::getDeviceName,device_name)
+                            .set(DmpDevice::getProductId,product_id)
+                            .set(DmpDevice::getUpdatedTime,LocalDateTime.now())
+                            .eq(DmpDevice::getDeviceCode,device_code);
+                    dmpDeviceService.update(updateWrapper);
                 }else if(flag == 1){
                     DmpDevice dmpDevice = new DmpDevice();
                     dmpDevice.setDeviceId(device_id);
@@ -288,31 +282,46 @@ public class DeviceHttpController {
                 String product_id = data.get(i).get("product_id").toString();
                 String company_code = data.get(i).get("company_code").toString();
 
-                if(flag == -1 || flag == 0){
-                    LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
-                    queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+                if(flag == -1){
+//                    LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
+//                    queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+//                            .eq(DmpDevice::getDeviceCode,device_code);
+//                    List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
+//
+//                    if(CollectionUtils.isNotEmpty(list)){
+//                        DmpDevice dmpDevice = new DmpDevice();
+//                        dmpDevice.setId(list.get(0).getId());
+//                        dmpDevice.setDeviceId(device_id);
+//                        dmpDevice.setDeviceCode(device_code);
+//                        dmpDevice.setDeviceName(device_name);
+//                        dmpDevice.setDeviceType(504);
+//                        dmpDevice.setProductId(Integer.parseInt(product_id));
+//                        dmpDevice.setCompanyCode(company_code);
+//                        dmpDevice.setUpdatedTime(LocalDateTime.now());
+//                        if(flag == -1){
+//                            dmpDevice.setDeviceName(list.get(0).getDeviceName());
+//                            dmpDevice.setDeleteFlag(1);
+//                           dmpDeviceService.updateById(dmpDevice);
+//                        }else if(flag == 0){
+//                            dmpDeviceService.updateById(dmpDevice);
+//                        }
+//                    }
+                    LambdaUpdateWrapper<DmpDevice> updateWrapper = Wrappers.lambdaUpdate();
+                    updateWrapper.set(DmpDevice::getDeviceId,device_id)
+                            .set(DmpDevice::getProductId,product_id)
+                            .set(DmpDevice::getUpdatedTime,LocalDateTime.now())
+                            .set(DmpDevice::getDeleteFlag,1)
                             .eq(DmpDevice::getDeviceCode,device_code);
-                    List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
-
-                    if(CollectionUtils.isNotEmpty(list)){
-                        DmpDevice dmpDevice = new DmpDevice();
-                        dmpDevice.setId(list.get(0).getId());
-                        dmpDevice.setDeviceId(device_id);
-                        dmpDevice.setDeviceCode(device_code);
-                        dmpDevice.setDeviceName(device_name);
-                        dmpDevice.setDeviceType(504);
-                        dmpDevice.setProductId(Integer.parseInt(product_id));
-                        dmpDevice.setCompanyCode(company_code);
-                        dmpDevice.setUpdatedTime(LocalDateTime.now());
-                        if(flag == -1){
-                            dmpDevice.setDeviceName(list.get(0).getDeviceName());
-                            dmpDevice.setDeleteFlag(1);
-                           dmpDeviceService.updateById(dmpDevice);
-                        }else if(flag == 0){
-                            dmpDeviceService.updateById(dmpDevice);
-                        }
-                    }
+                    dmpDeviceService.update(updateWrapper);
 
+                }else if(flag == 0){
+                    LambdaUpdateWrapper<DmpDevice> updateWrapper = Wrappers.lambdaUpdate();
+                    updateWrapper.set(DmpDevice::getDeviceId,device_id)
+                            .set(DmpDevice::getDeviceName,device_name)
+                            .set(DmpDevice::getProductId,product_id)
+                            .set(DmpDevice::getUpdatedTime,LocalDateTime.now())
+                            .eq(DmpDevice::getDeviceCode,device_code);
+                    dmpDeviceService.update(updateWrapper);
                 }else if(flag == 1){
                     DmpDevice dmpDevice = new DmpDevice();
                     dmpDevice.setDeviceId(device_id);