增加 null判断

xufenglei

2018-07-31 6b9938b5faf4a1b66f1c8886adc402d42bd447c1

 src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java

@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

@Service
@@ -28,8 +29,10 @@
      public void addOrModify(DeviceVersion deviceVersion){
            try{
                  if(deviceVersion.getId()==null){
                        deviceVersion.setUpdateTime(new Date());
                        deviceVersionMapper.insertSelective(deviceVersion);
                  }else{
                        deviceVersion.setUpdateTime(new Date());
                        deviceVersionMapper.updateByPrimaryKeySelective(deviceVersion);
                  }
            }
@@ -42,11 +45,18 @@
      public void deleteByIds(Integer... ids) {
            if(ids!=null&&ids.length>0){
                  if(ids.length==1){
                        deviceVersionMapper.deleteByPrimaryKey(ids[0]);
                        DeviceVersion deviceVersion = new DeviceVersion();
                        deviceVersion.setId(ids[0]);
                        deviceVersion.setIsDelete(true);
                        deviceVersion.setUpdateTime(new Date());
                        deviceVersionMapper.updateByPrimaryKeySelective(deviceVersion);
                  }else{
                        DeviceVersion deviceVersion = new DeviceVersion();
                        deviceVersion.setIsDelete(true);
                        deviceVersion.setUpdateTime(new Date());
                        Example example = new Example(ENTITY_CLASS);
                        example.or().andIn("id", Arrays.asList(ids));
                        deviceVersionMapper.deleteByExample(example);
                        deviceVersionMapper.updateByExampleSelective(deviceVersion,example);
                  }

            }
@@ -70,6 +80,23 @@
      public List<DeviceVersion> getVersionsByOrgId(int organizationId){
            return null;
      }

      @Override
      public Integer queryMaxVersionNo() {
            Example example = new Example(DeviceVersion.class);
            example.orderBy("version").desc();
            List<DeviceVersion> deviceVersionList = deviceVersionMapper.selectByExample(example);
            if(deviceVersionList.size()>0){
                  return deviceVersionList.get(0).getVersion();
            }
            return null;
      }
      @Override
      public DeviceVersion queryByVersionNo(int versionNo) {
            DeviceVersion query = new DeviceVersion();
            query.setVersion(versionNo);
            return deviceVersionMapper.selectOne(query);
      }
      @Override
      public List<Integer> getSensorIds(int deviceVersionId){
            DeviceVersionSensor deviceVersionSensor = new DeviceVersionSensor();
@@ -85,6 +112,10 @@
      public  List<DeviceVersion> queryByOrgId(Integer organizationId){
            return  this.deviceVersionMapper.selectListByOrgId(organizationId);
      }
      @Override
      public  List<DeviceVersion> queryByMpointId(Integer mpointId){
            return  this.deviceVersionMapper.selectListByMpointId(mpointId);
      }

      @Override
      public DeviceVersion queryVersionById(Integer versionId) {