数据字典添加分别字符key

liujun001
1 parent 1b83bb7c
Showing 9 changed files with 91 additions and 31 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/driver/NewDriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/location/LinggangKeyWorkLocationService.java
Bsth-admin/src/main/resources/mapper/driver/NewDriverMapper.xml
@@ -60,7 +60,7 @@ public class RefreshController {
         List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling);
         Set<Long> idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-        keyWorkLocationService.insertJob(dateStr, idSets);
+        keyWorkLocationService.insertJob(dateStr,null, idSets);
         return ResponseResult.success();
     }
@@ -440,6 +440,9 @@ public class KeyBoxController extends BaseController {
             keyInfos = keyInfoService.listLikePlate(keyInfo);
             if (CollectionUtils.isNotEmpty(keyInfos)) {
                 keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+            }else{
+                keyInfoIds = new HashSet<>();
+                keyInfoIds.add(-10000);
             }
         }
@@ -26,6 +26,7 @@ import com.ruoyi.service.DriverSchedulingExpandSmartService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
@@ -103,6 +104,8 @@ public class DriverJob implements InitializingBean {
     private RuleAttendanceMainService attendanceMainService;
     @Autowired
     private LinggangSchedulingService schedulingService;
+    @Autowired
+    private LinggangKeyWorkLocationService keyWorkLocationService;
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoUrl;
@@ -253,7 +256,6 @@ public class DriverJob implements InitializingBean {
     }
-    @Transactional(rollbackFor = Exception.class)
     public void runScheduling(long timeLong) {
         long timestamp = System.currentTimeMillis();
         Date date = new Date(timeLong);
@@ -278,9 +280,6 @@ public class DriverJob implements InitializingBean {
             scheduling.setType(100);
             List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
             idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-            if (CollectionUtils.isNotEmpty(idSets)) {
-                schedulingService.removeByIds(idSets);
-            }
         }
         scheduling.setType(type);
@@ -453,6 +452,7 @@ public class DriverJob implements InitializingBean {
         THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type,idSets,requestId);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
+
         log.info("拉取排班完毕:{}", dateKey);
         return driverSchedulingMap;
     }
@@ -11,4 +11,6 @@ public interface NewDriverMapper extends BaseMapper&lt;NewDriver&gt; {
      * 插入有值的列
      */
     int insertSelective(NewDriver name);
+
+    int updateSelective(NewDriver driver);
 }
 \ No newline at end of file
@@ -417,7 +417,7 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> IdSets,String requestId) {
+    public synchronized void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> idSets,String requestId) {
         JwtAuthenticationTokenFilter.putMDC("job",requestId);
         //查询当天是否保存过考情表  如果不存在则保存
         List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
@@ -521,7 +521,11 @@ public class ThreadJobService {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
-        keyWorkLocationService.insertJob(dateStr1,IdSets);
+        if(CollectionUtils.isNotEmpty(idSets)) {
+            keyWorkLocationService.removeBySchedulingId(idSets);
+            schedulingService.removeByIds(idSets);
+        }
+        keyWorkLocationService.insertJob(dateStr1,schedulings,null);
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
@@ -221,6 +221,42 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
             return false;
         }
+        Set<String> reqJobs = drivers.stream().map(NewDriver::getJobCode).collect(Collectors.toSet());
+        List<NewDriver> sourceDriver = list(reqJobs);
+        if (CollectionUtils.isEmpty(sourceDriver)) {
+            return saveBatch(drivers);
+        }
+
+        drivers = drivers.stream().map(d -> {
+            Optional<NewDriver> opt = sourceDriver.stream().filter(s -> Objects.equals(s.getJobCode(), d.getJobCode())).findFirst();
+            if (opt.isPresent()) {
+                d.setId(opt.get().getId());
+                d.setImage(null);
+            }
+            return d;
+        }).collect(Collectors.toList());
+
+        List<NewDriver> updateDriver = drivers.stream().filter(d -> Objects.nonNull(d.getId())).collect(Collectors.toList());
+        List<NewDriver> addDriver = drivers.stream().filter(d -> Objects.isNull(d.getId())).collect(Collectors.toList());
+
+        return updateByPrimaryKeys(updateDriver) && insertBach(addDriver);
+    }
+
+    public boolean updateByPrimaryKeys(List<NewDriver> drivers) {
+        if (CollectionUtils.isEmpty(drivers)) {
+            return true;
+        }
+        Set<Boolean> flags = new HashSet<>();
+        for (NewDriver driver : drivers) {
+            flags.add(updateByPrimaryKey(driver));
+        }
+        return flags.contains(Boolean.FALSE) ? Boolean.FALSE : Boolean.TRUE;
+    }
+
+    public boolean insertBach(List<NewDriver> drivers) {
+        if (CollectionUtils.isEmpty(drivers)) {
+            return true;
+        }
         return saveBatch(drivers);
     }
@@ -261,11 +297,6 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
                         driver.setJobCode(Convert.toStr(obj.get("personNumber")));
-                        if (CollectionUtils.isNotEmpty(jobs) && jobs.contains(driver.getJobCode())) {
-                            log.info("[{}]的数据已经存在", obj);
-                            return null;
-                        }
-
                         driver.setCompanyCode(Convert.toStr(obj.get("companyNumner")));
                         driver.setBrancheCompanyCode(Convert.toStr(obj.get("companyNumner")));
                         driver.setPersonnelName(Convert.toStr(obj.get("personName")));
@@ -78,7 +78,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         countWrapper.select(LinggangKeyWorkLocation::getId);
         switchTime(entity, countWrapper);
         switchTypes(entity, countWrapper);
-        switchKeyInfoIds(entity,countWrapper);
+        switchKeyInfoIds(entity, countWrapper);
         int count = count(countWrapper);
         List<LinggangKeyWorkLocation> lists = Collections.emptyList();
@@ -87,7 +87,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             LambdaQueryWrapper<LinggangKeyWorkLocation> selectWrapper = new LambdaQueryWrapper<>(entity);
             switchTime(entity, selectWrapper);
             switchTypes(entity, selectWrapper);
-            switchKeyInfoIds(entity,selectWrapper);
+            switchKeyInfoIds(entity, selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -292,17 +292,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertJob(String timeStr, Set<Long> schedulingIds) {
+    public synchronized boolean insertJob(String timeStr,List<LinggangScheduling> schedulings, Set<Long> schedulingIds) {
         try {
-            if (CollectionUtils.isNotEmpty(schedulingIds)) {
-                List<LinggangKeyWorkLocation> workLocations = listRecent(null, schedulingIds);
-                if (CollectionUtils.isNotEmpty(workLocations)) {
-                    Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
-                    if (CollectionUtils.isNotEmpty(ids)) {
-                        removeByIds(ids);
-                    }
-                }
-            }
+            removeBySchedulingId(schedulingIds);
             log.info("分配钥匙所存放的柜子:[{}]", timeStr);
@@ -316,7 +308,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                 return false;
             }
-            List<LinggangKeyWorkLocation> locations = computeKeyLocal(date);
+            List<LinggangKeyWorkLocation> locations = computeKeyLocal(date,schedulings);
             if (CollectionUtils.isNotEmpty(locations)) {
                 return saveBatch(locations);
             }
@@ -398,6 +390,20 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return removeById(id);
     }
+    @Override
+    public boolean removeBySchedulingId(Set<Long> schedulingIds) {
+        if (CollectionUtils.isNotEmpty(schedulingIds)) {
+            List<LinggangKeyWorkLocation> workLocations = listRecent(null, schedulingIds);
+            if (CollectionUtils.isNotEmpty(workLocations)) {
+                Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
+                if (CollectionUtils.isNotEmpty(ids)) {
+                 return    removeByIds(ids);
+                }
+            }
+        }
+        return true;
+    }
+
     public static void orderColumn(LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper, OrderEntity orderEntity) {
         if (org.apache.commons.lang3.StringUtils.equals("ascending", orderEntity.getOrder())) {
@@ -716,10 +722,10 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return source;
     }
-    private List<LinggangKeyWorkLocation> computeKeyLocal(Date date) {
+    private List<LinggangKeyWorkLocation> computeKeyLocal(Date date,List<LinggangScheduling> sourceSchedulings) {
-        List<LinggangScheduling> schedulings = querySchedulingByTiime(date);
+        List<LinggangScheduling> schedulings = querySchedulingByTiime(date,sourceSchedulings);
         if (schedulings == null) return null;
         List<LinggangVenueInfo> venueInfos = queryVenueInfo(schedulings);
@@ -811,12 +817,18 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
     }
-    private List<LinggangScheduling> querySchedulingByTiime(Date date) {
+    private List<LinggangScheduling> querySchedulingByTiime(Date date,List<LinggangScheduling> schedulings) {
+        if(CollectionUtils.isNotEmpty(schedulings)){
+            schedulings = schedulings.stream().filter(s->Objects.nonNull(s.getId())).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(schedulings)) {
+                return schedulings;
+            }
+        }
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setStartScheduleDate(DateUtil.shortDate(date));
         scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
         scheduling.setBcType(BC_TYPE_OUT);
-        List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
+        schedulings = schedulingService.list(scheduling);
         if (CollectionUtils.isEmpty(schedulings)) {
             log.info("没有查到排班信息:[{}]", date);
             return null;
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import java.util.Collection;
 import java.util.Date;
@@ -60,7 +61,7 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
     /***插入数据*/
     boolean insert(LinggangKeyWorkLocation entity);
-    boolean insertJob(String timeStr, Set<Long> IdSets);
+    boolean insertJob(String timeStr, List<LinggangScheduling> schedulings, Set<Long> IdSets);
     /**
      * 根据主键修改数据
@@ -78,4 +79,6 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
     boolean deleteById(Long id);
+    boolean removeBySchedulingId(Set<Long> schedulingId );
+
 }
 \ No newline at end of file
@@ -32,13 +32,18 @@
         <result column="image_version" jdbcType="VARCHAR" property="imageVersion"/>
     </resultMap>
-    <insert id="insertSelective" keyColumn="job_code" keyProperty="jobCode" useGeneratedKeys="true"
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ruoyi.domain.driver.NewDriver">
         INSERT INTO driver
         <include refid="insertSelectiveColumn"></include>
         <include refid="insertSelectiveValue"></include>
     </insert>
+    <update id="updateSelective" parameterType="com.ruoyi.domain.driver.NewDriver">
+        update  driver set <include refid="updateByPrimaryKeySelectiveSql"></include>
+        where id=#{id}
+    </update>
+
     <sql id="columns">
         id
         ,  job_code   ,  company_code   ,  branche_company_code   ,  personnel_name   ,  papers_code   ,  ic_card_code   ,  personnel_type   ,  posts   ,  card   ,  telphone   ,  ic_rfid   ,  id_rfid   ,  tag_rfid   ,  remark   ,  line_name   ,  line_code   ,  face_sign_in   ,  image   ,  update_time   ,  sign_in_equipment   ,  fleet_name   ,  face_Feature   ,  blue_Tooth   ,  driver_integer   ,  synContent   ,  csn   ,  image_version