添加删除事项时候关联删除设备事项

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -37,6 +37,7 @@ import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import com.mortals.xhx.common.plugin.LoopSingleRowTableRenderPolicy;
 import com.mortals.xhx.common.utils.ExportDocUtil;
 import com.mortals.xhx.common.utils.WordUtil;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
 import com.mortals.xhx.module.hotword.service.HotwordService;
@@ -93,6 +94,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     @Autowired
     private HotwordService hotwordService;
 
+
     public static String word[] = {"doc", "dot", "wps", "wpt", "docx", "dotx", "docm", "dotm"};
 
     public static String imgs[] = {"jpg", "png", "jpeg", "gif"};
@@ -146,6 +148,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             matterEntity.setDatumCount(count);
             matterService.update(matterEntity, context);
         }
+
+
+
     }
 
     @Override

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -11,6 +11,9 @@ import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
 import com.mortals.xhx.module.hotword.service.HotwordService;
@@ -50,9 +53,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Autowired
     private MatterDatumService matterDatumService;
     @Autowired
-    private ISiteFeign siteFeign;
-    @Autowired
     private HotwordService hotwordService;
+    @Autowired
+    private DeviceMatterDatumService deviceMatterDatumService;
 
     @Override
     protected void findAfter(MatterEntity entity, PageInfo pageInfo, Context context, List<MatterEntity> list) throws AppException {
@@ -77,7 +80,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
             }
         }
-        if (!ObjectUtils.isEmpty(list)&&!ObjectUtils.isEmpty(entity.getMatterFullName())) {
+        if (!ObjectUtils.isEmpty(list) && !ObjectUtils.isEmpty(entity.getMatterFullName())) {
             //添加更新热门词汇
             HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(entity.getSiteId()).hotwords(entity.getMatterFullName()), context);
             if (ObjectUtils.isEmpty(hotwordEntity)) {
@@ -181,7 +184,17 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Override
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
         List<MatterDatumEntity> matterDatumlist = matterDatumService.find(new MatterDatumQuery().matterIdList(Arrays.asList(ids)));
-        matterDatumService.removeList(matterDatumlist, context);
+
+        if (!ObjectUtils.isEmpty(matterDatumlist)) matterDatumService.removeList(matterDatumlist, context);
+
+        //关联删除设备事项
+        DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery();
+        deviceMatterDatumQuery.setMatterIdList(Arrays.asList(ids));
+        List<DeviceMatterDatumEntity> matterDatumEntityList = deviceMatterDatumService.find(deviceMatterDatumQuery);
+        if (!ObjectUtils.isEmpty(matterDatumEntityList))
+            deviceMatterDatumService.removeList(matterDatumEntityList, context);
+
+
         super.removeAfter(ids, context, result);
     }