2022-3-16 吴卿华

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

@@ -12,6 +12,7 @@ import com.zehong.system.service.ITDetectorInfoService;
 import com.zehong.system.service.ITDetectorUserService;
 import com.zehong.system.service.ITEmployedPeopleInfoService;
 import com.zehong.web.codeconfig.CodeConFig;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -90,11 +91,12 @@ public class TDeviceInfoController extends BaseController
     {
         //生成四位随机码
         String code = CodeConFig.RandomCode();
-        listaw.gettDeviceInfo().setDeviceCode(code);
+        String intFlag = String.valueOf((int)(Math.random() * 1000000));
+        listaw.gettDeviceInfo().setDeviceCode(intFlag);
         //添加设备信息表数据 并且返回新增id
         tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
 
-        if (listaw.gettDeviceInfoS()!=null){
+        if (CollectionUtils.isNotEmpty(listaw.gettDeviceInfoS())){
             //将关联设备信息与设备进行绑定
             tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId(),listaw.gettDeviceInfo().getRelationDeviceType());
         }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TSiteStationInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.zehong.system.domain.TTSiteStationInfoList;
 import com.zehong.system.service.ITDeviceInfoService;
 import com.zehong.system.service.ITEmployedPeopleInfoService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -88,7 +89,7 @@ public class TSiteStationInfoController extends BaseController {
         String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tSiteStationInfos.gettDeviceInfo().getBeyondEnterpriseId());
         tSiteStationInfos.gettDeviceInfo().setBeyondEnterpriseName(EnterpriseName);
         tSiteStationInfoService.insertTSiteStationInfo(tSiteStationInfos.gettDeviceInfo());
-        if (tSiteStationInfos.gettDeviceInfoS()!=null){
+        if (CollectionUtils.isNotEmpty(tSiteStationInfos.gettDeviceInfoS())){
             //将关联设备信息与设备进行绑定
             tDeviceInfoService.updatetRelationDeviceDetailInfo(tSiteStationInfos.gettDeviceInfoS(),tSiteStationInfos.gettDeviceInfo().getSiteStationId(),tSiteStationInfos.gettDeviceInfo().getRelationDeviceType());
         }