Browse Source

叉车导入根据人员数据字典保存人员id

huangpeng 9 months ago
parent
commit
79e574968f

+ 16 - 4
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/config/EquForkliftRepairRecordListener.java

@@ -3,17 +3,21 @@ package com.rongwei.bscommon.sys.config;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.rongwei.bscommon.sys.excel.EquForkliftRepairRecordTemplate;
-import com.rongwei.bscommon.sys.excel.EquMaintenanceStandardTemplate;
 import com.rongwei.bsentity.domain.EquForkliftRepairRecordDo;
-import com.rongwei.bsentity.domain.EquMaintenanceStandardDo;
-import com.rongwei.bsentity.enums.MaintenanceTypeEnum;
 import com.rongwei.bsentity.enums.PlantEnum;
+import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+import com.rongwei.rwadmincommon.system.service.SysDictService;
+import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author shangmi
@@ -29,11 +33,15 @@ public class EquForkliftRepairRecordListener extends AnalysisEventListener<EquFo
 
     private List<String> errorData = new ArrayList<>();
 
+
+
+
+
     @Override
     public void invoke(EquForkliftRepairRecordTemplate forkliftRepairRecordTemplate, AnalysisContext analysisContext) {
         try {
             log.info("解析到一条数据:{}", forkliftRepairRecordTemplate);
-            for (Field field : forkliftRepairRecordTemplate.getClass().getDeclaredFields()) {
+          for (Field field : forkliftRepairRecordTemplate.getClass().getDeclaredFields()) {
                 field.setAccessible(true);
                 String name = field.getName();
                 if (Objects.isNull(field.get(forkliftRepairRecordTemplate)) && Arrays.asList(NON_SET).contains(name)) {
@@ -67,6 +75,8 @@ public class EquForkliftRepairRecordListener extends AnalysisEventListener<EquFo
      * 数据转换
      *
      * @param
+     * @param
+     * @param orgMap
      * @return {@link EquForkliftRepairRecordDo}
      * @date 2023/12/8 10:14
      * @author shangmi
@@ -78,6 +88,8 @@ public class EquForkliftRepairRecordListener extends AnalysisEventListener<EquFo
         // SysUserVo currentUser = CommonUtils.getCurrentUser();
         EquForkliftRepairRecordDo equForkliftRepairRecordDo = new EquForkliftRepairRecordDo();
         BeanUtils.copyProperties(forkliftRepairRecordTemplate, equForkliftRepairRecordDo);
+
+
         equForkliftRepairRecordDo.setCreatedate(date)
                 .setModifydate(date)
                 .setId(SecurityUtil.getUUID())

+ 15 - 0
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquForkliftRepairRecordServiceImpl.java

@@ -14,6 +14,10 @@ import com.rongwei.bscommon.sys.utils.DateUtils;
 import com.rongwei.bsentity.domain.EquForkliftRepairRecordDo;
 import com.rongwei.bsentity.enums.MaintenanceTypeEnum;
 import com.rongwei.bsentity.enums.PlantEnum;
+import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+import com.rongwei.rwadmincommon.system.service.SysDictService;
+import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
@@ -41,6 +45,12 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
     @Autowired
     EquForkliftRepairRecordDao equForkliftRepairRecordDao;
 
+    @Autowired
+    private SysDictService dictService;
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+
     @Override
     public R equForkliftRepairRecordService(MultipartFile multipartFile) throws IOException {
         Date date = new Date();
@@ -73,6 +83,10 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
             return R.error(JSON.toJSONString(errorData));
         }
         SysUserVo currentUser = CommonUtils.getCurrentUser();
+
+        List<SysDictDo> repairPersonType = dictService.getByRedis("equ_cxwxbyr");
+        Map<String, String> dictMap = repairPersonType.stream().collect(Collectors.toMap(SysDictDo::getName, SysDictDo::getValue));
+
         // 生成流水号
         for (EquForkliftRepairRecordDo forkliftRepairRecord : newForkliftRepairRecord) {
             SysSerialVo sysSerialVo = new SysSerialVo();
@@ -91,6 +105,7 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
                     .setCreateuserid(currentUser.getId())
                     .setCreateusername(currentUser.getName())
                     .setModifyusername(currentUser.getName())
+                    .setRapairid(dictMap.getOrDefault(forkliftRepairRecord.getRapairname(),""))
                     .setModifyuserid(currentUser.getId());
         }
         equForkliftRepairRecordService.saveBatch(newForkliftRepairRecord, 200);