Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

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

@@ -1545,7 +1545,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
         carForUE4VO.setCarType(equipment.getEquipmentCategory().getName());
 
         // 数据库字段（is_import 0->国产， 1->进口）
-        carForUE4VO.setIsImport(Boolean.TRUE == car.getIsImport() ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
+        carForUE4VO.setIsImport(Boolean.TRUE.equals(car.getIsImport()) ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
         carForUE4VO.setBrand(car.getBrand());
         QueryWrapper<SystemDic> countryQueryWrapper = new QueryWrapper<>();
         countryQueryWrapper.eq("id", car.getCountry());
@@ -1554,7 +1554,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
         carForUE4VO.setStandard(car.getStandard());
         ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
         carForUE4VO.setManufacturerName(manufacturerInfo.getName());
-        carForUE4VO.setCccAuth(Boolean.TRUE == car.getCccAuth() ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
+        carForUE4VO.setCccAuth(Boolean.TRUE.equals(car.getCccAuth()) ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
         QueryWrapper<SystemDic> chassisCountryQueryWrapper = new QueryWrapper<>();
         chassisCountryQueryWrapper.eq("id", car.getChassisCountry());
         SystemDic dic = iSystemDicService.getBaseMapper().selectOne(chassisCountryQueryWrapper);
@@ -1620,7 +1620,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     @Override
     public void refreshStaData() {
         List<Map<String, Object>> result = this.baseMapper.queryCompanyCarStaData();
-        result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total")));
+        result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total"),86400));
     }
 
     private String buildKey(Map<String, Object> row) {

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

@@ -1589,7 +1589,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Override
     public void refreshStaData() {
         List<Map<String, Object>> result = this.baseMapper.queryCompanyStaData();
-        result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total")));
+        result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total"),86400));
     }
 
     private String buildKey(Map<String, Object> row) {

amos-boot-system-equip/src/main/resources/application.properties

@@ -36,7 +36,7 @@ dutyMode.fegin.name=AMOS-DUTYMODE
 riskSource.feign.name=AMOS-AUTOSYS
 equipManage.name=AMOS-EQUIPMANAGE
 iot.vehicle.track=AMOS-API-IOT
-jcs.fegin.name=JCS-chen
+jcs.fegin.name=JCS
 video.fegin.name=VIDEO
 #项目初始化画布id
 morphic.projectSeq=1390314016458514433