修改随车人员，

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/PointTreeVo.java

@@ -145,5 +145,8 @@ public class PointTreeVo {
 
     private String address;
 
-
+    /**
+     * 装备编码
+     */
+    private String code;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -308,7 +308,8 @@
         SELECT DISTINCT
             car.resources_id sequenceNbr,
             car.resources_name,
-            'car' type
+            'car' type,
+            car.car_status carState
         FROM
             jc_power_transfer_company_resources car
                 LEFT JOIN jc_power_transfer_company company ON company.sequence_nbr = car.power_transfer_company_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
 import com.yeejoin.equipmanage.common.enums.ExcelEnums;
@@ -67,6 +68,7 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     @Autowired
     IEquipmentDetailService iEquipmentDetailService;
+
     @Autowired
     EquipmentDetailMapper equipmentDetailMapper;
     @Autowired
@@ -580,16 +582,52 @@ public class EquipmentDetailController extends AbstractBaseController {
 //        }
 
         // List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
-          Object date="";
+
+
+            String key="";
+        try {
+             UUID uuid = UUID.randomUUID();
+             key= uuid.toString();
              ExcelEnums excelEnums = ExcelEnums.getByKey(type);
             ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
-
-        date= excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
+           // date= excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
+            EquipmentDetailController controllerProxy1 = SpringUtils.getBean(EquipmentDetailController.class);
+            controllerProxy1.commonUpload(file, excelDto,key, getSelectedOrgInfo(), getUserInfo());
             EquipmentDetailController controllerProxy = SpringUtils.getBean(EquipmentDetailController.class);
             controllerProxy.refreshAllCount();
-        return ResponseHelper.buildResponse(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BadRequest(e.getMessage());
+        }
+           return ResponseHelper.buildResponse(key);
+    }
+
+
+
+    @Async
+    public void commonUpload(MultipartFile file, ExcelDto excelDto, String key, ReginParams reginParams, AgencyUserModel user) {
+        synchronized(this.getClass()){
+            Object date="";
+            date= excelService.commonUpload(file, excelDto, reginParams,user);
+            redisUtils.set(key, date);
         }
 
+    }
+
+
+
+
+     @RequestMapping(value = "/getUpload/{key}", method = RequestMethod.GET)
+     @TycloudOperation(ApiLevel = UserType.AGENCY)
+     @ApiOperation(httpMethod = "GET", value = "根据id查询上传进度", notes = "根据id查询上传进度")
+     public ResponseModel<Object> getUpload( @PathVariable String key) {
+
+             if(redisUtils.hasKey(key)){
+                 return ResponseHelper.buildResponse(redisUtils.get(key));
+             } else{
+                 return ResponseHelper.buildResponse(null);
+             }
+     }
     @Async
     public void refreshAllCount() {
         // 清空单位装备分类树缓存

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -6,16 +6,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.enums.BillContentEnum;
 import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.dto.ExcelDto;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -68,7 +74,10 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
     @Autowired
     JCSRemoteService jcsRemoteService;
-
+    @Autowired
+    private RedisUtils redisUtils;
+    @Autowired
+    private IExcelService excelService;
 
     @Value("${fileserver_domain}")
     private String fileServer;
@@ -299,4 +308,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     public List<OrgMenuDto> companyDeptTree() {
         return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, null);
     }
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

@@ -294,9 +294,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
         StringBuffer errBufferName= new StringBuffer();
         StringBuffer erryy= new StringBuffer();
-        int errNum=0; //失败条数
-        int okNum=0; //成功条数
-        errBufferName.append("导入失败装备：");
+//        StringBuffer errNum="0"; //失败条数
+//        StringBuffer okNum="0"; //成功条数
+//        errBufferName.append("导入失败装备：");
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
         List<EquipmentSpecific> list = new ArrayList<>();
         try {
@@ -478,8 +478,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             for (int i = 0; i < equipmentDetailDownloadVOS.size(); i++) {
 
                     try {
-                    seveRK( equipmentDetailDownloadVOS.get(i), reginParams, agencyUserModel, fireFightSysIdsBuffer,list, errBufferName ,erryy ,  errNum,
-                         okNum);
+                    seveRK( equipmentDetailDownloadVOS.get(i), reginParams, agencyUserModel,
+                            fireFightSysIdsBuffer,list, errBufferName ,erryy );
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -503,11 +503,13 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         } catch (Exception e) {
             //处理异常 返回 成功失败条数
             e.printStackTrace();
-            String date="上传成功:"+okNum+"条---上传失败:"+errNum+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
+            String[] split = errBufferName.toString().split(",");
+            String date="上传成功:"+(equipmentDetailDownloadVOS.size()-(split!=null?split.length:0))+"条---上传失败:"+(split!=null?split.length:0)+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
             log.error(date);
             return date;
         }
-        String date="上传成功:"+okNum+"条---上传失败:"+errNum+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
+        String[] split = errBufferName.toString().split(",");
+        String date="上传成功:"+(equipmentDetailDownloadVOS.size()-(split!=null?split.length:0))+"条---上传失败:"+(split!=null?split.length:0)+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
         log.error(date);
         return date;
     }
@@ -519,9 +521,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                          StringBuffer fireFightSysIdsBuffer,
                          List<EquipmentSpecific> list,
                          StringBuffer errBufferName,
-                         StringBuffer erryy,
-                         int errNum,
-                         int okNum
+                         StringBuffer erryy
+
                                                    ){
          SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -533,13 +534,14 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentQueryWrapper.lambda().eq(Equipment::getCode, equipmentDetailDownloadVOS.getCode());
                  Equipment equipment = equipmentMapper.selectOne(equipmentQueryWrapper);
                  if (equipment == null) {
-
+                     erryy.append(String.format("装备(器材)编码[%S]填写错误，请输入正确的装备(器材)编码！",equipmentDetailDownloadVOS.getCode()) + ",");
                      throw new RuntimeException(String.format("装备(器材)编码[%S]填写错误，请输入正确的装备(器材)编码！",equipmentDetailDownloadVOS.getCode()));
                  }
                  String sysCode = equipmentDetailDownloadVOS.getSystemCode();
                  if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
                      Integer code = equipmentSpecificMapper.selectCount(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
                      if (code != 0) {
+                         erryy.append(String.format("设备编码[%S]填写重复，请重新输入！",sysCode)+ ",");
                          throw new RuntimeException(String.format("设备编码[%S]填写重复，请重新输入！",sysCode));
                      }
                  }
@@ -547,10 +549,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())) {
                      Integer iot_code = equipmentSpecificMapper.selectCount(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
                      if (iot_code != 0) {
+                         erryy.append(String.format("物联编码[%S]填写重复，请重新输入！",iot)+ ",");
                          throw new RuntimeException(String.format("物联编码[%S]填写重复，请重新输入！",iot));
                      }
                      if(iot.startsWith("20210003")||iot.startsWith("20210004")||iot.startsWith("20210005")){
-
+                         erryy.append(String.format("物联编码[%S]航班已占用，请重新输入！",iot)+ ",");
                          throw new BadRequest("物联编码航班已占用");
                      }
                  }
@@ -640,6 +643,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                      warehouseStructureQueryWrapper.lambda().eq(WarehouseStructure::getCode, equipmentDetailDownloadVOS.getWarehouseStructCode());
                      WarehouseStructure warehouseStructure = warehouseStructureService.getOne(warehouseStructureQueryWrapper);
                      if (warehouseStructure == null) {
+                         erryy.append(String.format("货位编码[%S]填写错误，请输入正确的货位编码！",equipmentDetailDownloadVOS.getWarehouseStructCode())+ ",");
                          throw new RuntimeException(String.format("货位编码[%S]填写错误，请输入正确的货位编码！",equipmentDetailDownloadVOS.getWarehouseStructCode()));
                      } else {
                          equipmentSpecific.setPosition(warehouseStructure.getFullName());
@@ -706,10 +710,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  list.add(equipmentSpecific);
                  this.equipmentSpecificIndexSave(equipmentDetail, equipmentSpecific);
                      platformTransactionManager.commit(transactionStatus);
-                     okNum=okNum+1;
                  } catch (Exception e) {
                      platformTransactionManager.rollback(transactionStatus);
-                     errNum=errNum+1;
                      errBufferName.append(equipmentDetailDownloadVOS.getCode() + ",");
 
                      e.printStackTrace();

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -210,8 +210,9 @@
         'equipment' as componentKey,
         'equipment' as `key`,
         equ.img as imgPath,
---         spe.qr_code as equipCode,
-        spe.code as equipCode,
+        spe.qr_code as equipCode,
+--         spe.code as equipCode,
+        spe.code  AS code,
         stru.source_id as parentId,
         cat.id as equipId,
         cat.code as categoryCode,
@@ -256,7 +257,8 @@
             'equipment' AS componentKey,
             'video' AS `key`,
             img AS imgPath,
-            vid.CODE AS equipCode,
+            vid.code AS equipCode,
+            vid.code AS code,
             vis.source_id AS parentId,
             vid.id AS equipId,
             vid.CODE AS categoryCode,