Commit 07ec72a9 authored by 赵啸非's avatar 赵啸非

添加样表设备列表

parent 2d8c7757
package com.mortals.xhx.module.device.service; package com.mortals.xhx.module.device.service;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.device.dao.DeviceMatterDatumDao;
import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity; import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
/** /**
* DeviceMatterDatumService * DeviceMatterDatumService
* * <p>
* 设备事项申请材料业务 service接口 * 设备事项申请材料业务 service接口
* *
* @author zxfei * @author zxfei
* @date 2023-02-25 * @date 2023-02-25
*/ */
public interface DeviceMatterDatumService extends ICRUDService<DeviceMatterDatumEntity,Long>{ public interface DeviceMatterDatumService extends ICRUDService<DeviceMatterDatumEntity, Long> {
DeviceMatterDatumDao getDao();
} }
\ No newline at end of file
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery; import com.mortals.xhx.module.matter.model.MatterDatumQuery;
...@@ -55,6 +56,11 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device ...@@ -55,6 +56,11 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
@Override @Override
protected void saveBefore(DeviceMatterDatumEntity entity, Context context) throws AppException { protected void saveBefore(DeviceMatterDatumEntity entity, Context context) throws AppException {
super.saveBefore(entity, context); super.saveBefore(entity, context);
int count = this.getDao().getCount(new DeviceMatterDatumQuery().deviceId(entity.getDeviceId()).matterId(entity.getMatterId()));
if(count>0){
throw new AppException("当前设备关联事项已存在,不能新增!");
}
//entity.getMatterId() //entity.getMatterId()
if(!ObjectUtils.isEmpty(entity.getMatterId())){ if(!ObjectUtils.isEmpty(entity.getMatterId())){
MatterEntity matterEntity = matterService.get(entity.getMatterId()); MatterEntity matterEntity = matterService.get(entity.getMatterId());
......
...@@ -2,6 +2,7 @@ package com.mortals.xhx.module.device.web; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery; import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
...@@ -17,12 +18,10 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity; ...@@ -17,12 +18,10 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
import com.mortals.xhx.module.device.service.DeviceMatterDatumService; import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
...@@ -55,6 +54,20 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll ...@@ -55,6 +54,20 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll
} }
@Override
protected void batchSaveBefore(List<DeviceMatterDatumEntity> list, Map<String, Object> model, Context context) throws AppException {
Iterator<DeviceMatterDatumEntity> iterator = list.iterator();
while (iterator.hasNext()) {
DeviceMatterDatumEntity next = iterator.next();
int count = this.service.getDao().getCount(new DeviceMatterDatumQuery().deviceId(next.getDeviceId()).matterId(next.getMatterId()));
if(count>0){
iterator.remove();
}
}
super.batchSaveBefore(list, model, context);
}
@Override @Override
protected int infoAfter(Long id, Map<String, Object> model, DeviceMatterDatumEntity entity, Context context) throws AppException { protected int infoAfter(Long id, Map<String, Object> model, DeviceMatterDatumEntity entity, Context context) throws AppException {
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getMatterId())); List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getMatterId()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment