|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.fdkankan.fusion.common.FilePath;
|
|
import com.fdkankan.fusion.common.FilePath;
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
|
|
+import com.fdkankan.fusion.common.ResultData;
|
|
import com.fdkankan.fusion.common.util.*;
|
|
import com.fdkankan.fusion.common.util.*;
|
|
import com.fdkankan.fusion.entity.CaseNumEntity;
|
|
import com.fdkankan.fusion.entity.CaseNumEntity;
|
|
import com.fdkankan.fusion.entity.Model;
|
|
import com.fdkankan.fusion.entity.Model;
|
|
@@ -14,6 +15,9 @@ import com.fdkankan.fusion.mapper.ICaseNumMapper;
|
|
import com.fdkankan.fusion.request.SceneNumParam;
|
|
import com.fdkankan.fusion.request.SceneNumParam;
|
|
import com.fdkankan.fusion.service.*;
|
|
import com.fdkankan.fusion.service.*;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.fdkankan.fusion.websocket.SessionService;
|
|
|
|
+import com.fdkankan.fusion.websocket.enums.CommonEnum;
|
|
|
|
+import com.fdkankan.fusion.websocket.vo.WsMessage;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -56,6 +60,8 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
ICaseTagService caseTagService;
|
|
ICaseTagService caseTagService;
|
|
@Autowired
|
|
@Autowired
|
|
ICaseTagPointService caseTagPointService;
|
|
ICaseTagPointService caseTagPointService;
|
|
|
|
+ @Autowired
|
|
|
|
+ SessionService sessionService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<CaseNumEntity> getByCaseId(Integer caseId) {
|
|
public List<CaseNumEntity> getByCaseId(Integer caseId) {
|
|
@@ -179,6 +185,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
|
|
|
|
private List<String> updateByNumList(Integer caseId, List<SceneNumParam> sceneNumParam) {
|
|
private List<String> updateByNumList(Integer caseId, List<SceneNumParam> sceneNumParam) {
|
|
List<String> addList = new ArrayList<>();
|
|
List<String> addList = new ArrayList<>();
|
|
|
|
+ List<String> delMsgList = new ArrayList<>();
|
|
for (SceneNumParam param : sceneNumParam) {
|
|
for (SceneNumParam param : sceneNumParam) {
|
|
Integer type = param.getType();
|
|
Integer type = param.getType();
|
|
List<String> numList = param.getNumList();
|
|
List<String> numList = param.getNumList();
|
|
@@ -191,6 +198,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
for (String num : hanNumList) {
|
|
for (String num : hanNumList) {
|
|
if(!numList.contains(num)){
|
|
if(!numList.contains(num)){
|
|
delList.add(num);
|
|
delList.add(num);
|
|
|
|
+ delMsgList.add(num);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (String num : numList) {
|
|
for (String num : numList) {
|
|
@@ -200,6 +208,9 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
}
|
|
}
|
|
this.deleteByNum(caseId,delList,param.getType());
|
|
this.deleteByNum(caseId,delList,param.getType());
|
|
}
|
|
}
|
|
|
|
+ if(!delMsgList.isEmpty()){
|
|
|
|
+ sessionService.sendSingleByCaseId(caseId, WsMessage.okResult(CommonEnum.NOTICE, ResultData.ok(ResultCode.CASE_REMOVE_SCENE)));
|
|
|
|
+ }
|
|
|
|
|
|
return addList;
|
|
return addList;
|
|
}
|
|
}
|