Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/TaskController.java

@@ -0,0 +1,25 @@
+package com.usky.iot.controller.web;
+
+import com.usky.iot.service.job.DmpDataOverviewJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zyj
+ * @since 2023-06-05
+ */
+@EnableScheduling
+@Component
+public class TaskController {
+    @Autowired
+    private DmpDataOverviewJob dmpDataOverviewJob;
+
+    @Scheduled(cron = "0 0 1 * * ? ") //每天凌晨1点执行
+    public void task() {
+        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
+        dmpDataOverviewJob.execute();
+    }
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpProductAttribute.java

@@ -136,7 +136,4 @@ public class DmpProductAttribute implements Serializable {
      */
     private Integer tenantId;
 
-
-    @TableField(exist = false)
-    private List<DmpProductAttributeAttach> dmpProductAttributeAttachList;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductAttributeAttachService.java

@@ -17,10 +17,4 @@ import java.util.List;
  */
 public interface DmpProductAttributeAttachService extends CrudService<DmpProductAttributeAttach> {
 
-
-    void addBatch(DmpProductAttribute dmpProductAttribute);
-
-    void deleteBatch(DmpProductAttribute dmpProductAttribute);
-
-    List<DmpProductAttributeAttach> listByAttributeIds(List<Integer> attributeIds);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeAttachServiceImpl.java

@@ -23,26 +23,4 @@ import java.util.List;
 @Service
 public class DmpProductAttributeAttachServiceImpl extends AbstractCrudService<DmpProductAttributeAttachMapper, DmpProductAttributeAttach> implements DmpProductAttributeAttachService {
 
-    @Override
-    public void addBatch(DmpProductAttribute dmpProductAttribute) {
-        List<DmpProductAttributeAttach> dmpProductAttributeAttachList = dmpProductAttribute.getDmpProductAttributeAttachList();
-        if (CollectionUtil.isNotEmpty(dmpProductAttributeAttachList)){
-            dmpProductAttributeAttachList.forEach(s -> s.setAttributeId(dmpProductAttribute.getId()));
-            this.saveBatch(dmpProductAttributeAttachList);
-        }
-    }
-
-    @Override
-    public void deleteBatch(DmpProductAttribute dmpProductAttribute) {
-        LambdaQueryWrapper<DmpProductAttributeAttach> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(DmpProductAttributeAttach::getAttributeId,dmpProductAttribute.getId());
-        this.remove(lambdaQuery);
-    }
-
-    @Override
-    public List<DmpProductAttributeAttach> listByAttributeIds(List<Integer> attributeIds) {
-        LambdaQueryWrapper<DmpProductAttributeAttach> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.in(CollectionUtil.isNotEmpty(attributeIds),DmpProductAttributeAttach::getAttributeId,attributeIds);
-        return this.list(lambdaQuery);
-    }
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeServiceImpl.java

@@ -47,7 +47,6 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
             throw new BusinessException("新增产品属性信息'" + dmpProductAttribute.getAttributeName() + "'失败，产品信息已存在");
         }
         this.save(dmpProductAttribute);
-        dmpProductAttributeAttachService.addBatch(dmpProductAttribute);
         return true;
     }
 
@@ -59,8 +58,6 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
             throw new BusinessException("新增产品属性信息'" + dmpProductAttribute.getAttributeName() + "'失败，产品信息已存在");
         }
         this.updateById(dmpProductAttribute);
-        dmpProductAttributeAttachService.deleteBatch(dmpProductAttribute);
-        dmpProductAttributeAttachService.addBatch(dmpProductAttribute);
     }
 
     @Override
@@ -82,21 +79,9 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
                 .eq(null != paRequest.getProductId(),DmpProductAttribute::getProductId,paRequest.getProductId())
                 .eq(DmpProductAttribute::getDeleteFlag,0);
         page = this.page(page,lambdaQuery);
-        List<DmpProductAttribute> records = page.getRecords();
-        List<DmpProductAttributeAttach> dmpProductAttributeAttaches = dmpProductAttributeAttachService.listByAttributeIds(records.stream().map(DmpProductAttribute::getId).collect(Collectors.toList()));
-        page.getRecords().forEach(s ->
-            enhanceDmpProductAttribute(s,dmpProductAttributeAttaches));
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 
-    public void enhanceDmpProductAttribute(DmpProductAttribute dmpProductAttribute, List<DmpProductAttributeAttach> dmpProductAttributeAttachList){
-        List<DmpProductAttributeAttach> collect = dmpProductAttributeAttachList
-                .stream()
-                .filter(s -> s.getAttributeId().equals(dmpProductAttribute.getProductId()))
-                .collect(Collectors.toList());
-        dmpProductAttribute.setDmpProductAttributeAttachList(collect);
-    }
-
     @Override
     public boolean remove(Integer id) {
         DmpProductAttribute dmpProductAttribute = this.getById(id);