Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/action/UpdateQrCodeAction.java

@@ -53,6 +53,7 @@ public class UpdateQrCodeAction {
                                 @MethodParam(paramLabel = "计算规则") String rule) {
 
         if (Boolean.TRUE.equals(enable)) {
+            log.info("收到规则赋码回调方法》》》》》》》》》》》》》》");
             EquipQrDateDto equipQrDateDtoN = JSONObject.parseObject(equipQrDateDto.toString(), EquipQrDateDto.class);
             List<Map<String, String>> data = equipQrDateDtoN.getData();
             String contrast = equipQrDateDtoN.getContrast();

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

@@ -38,6 +38,7 @@ import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
 import liquibase.pro.packaged.S;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -72,6 +73,7 @@ import static org.typroject.tyboot.core.foundation.utils.DateTimeUtil.ISO8601_DA
  */
 @Service
 //@EnableAsync
+@Slf4j
 public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificMapper, EquipmentSpecific> implements IEquipmentSpecificSerivce {
 
     @Autowired
@@ -2165,6 +2167,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Override
     public void updateEquipQrCode(List<Map<String, String>> mapList, String status) {
+        log.info("收到规则回调后调用装备消码方法》》》》》》》》》》》》》》,{}", mapList);
         if (!CollectionUtils.isEmpty(mapList)) {
             List<String> ids = mapList.stream().map(m -> m.get("sourceId")).filter(Objects::nonNull).collect(Collectors.toList());
             equipmentSpecificMapper.updateEquipQrCode(ids, status);