mac地址唯一性服务，查询数据行业功能添加。

fengxiang

2018-05-15 781c9724dac7d3698161ecb845e55ba1800b8ec1

mac地址唯一性服务，查询数据行业功能添加。

 src/main/java/com/moral/controller/ProfessionController.java

@@ -9,6 +9,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.Optional;

@RestController
@RequestMapping("profession")
@@ -16,7 +17,8 @@
      @Resource
      ProfessionService professionService;
      @GetMapping(value = "getall")
     public ResultBean<List<Profession>> getALL(){
          return  new ResultBean<>(professionService.getProfessiontList());
     public ResultBean<List<Profession>> getALL(Optional<String> name){
          String queryName = name.isPresent()?name.get():null;
          return  new ResultBean<>(professionService.queryByName(queryName));
      }
}

 src/main/java/com/moral/entity/charts/DataCondition.java

@@ -10,4 +10,6 @@
      private Integer actualTime;//实际时间
      private AreaRange areaRange;//区域范围
      private Integer areaRangeId;//区域范围的ID
      private DeviceDimension deviceDimension; // 维度类型
      private Object dimensionValue;// 维度值
}

 src/main/java/com/moral/entity/charts/DeviceDimension.java

New file
@@ -0,0 +1,5 @@
package com.moral.entity.charts;

public enum DeviceDimension {
    MONITORPOINT,PROFESSION,NONE;
}

 src/main/java/com/moral/service/ProfessionService.java

@@ -6,5 +6,7 @@

public interface ProfessionService {

    List<Profession> queryByName(String nameLike);

    public List<Profession> getProfessiontList();
}

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

@@ -1,9 +1,11 @@
package com.moral.service.impl;

import com.moral.common.util.StringUtils;
import com.moral.entity.Profession;
import com.moral.mapper.ProfessionMapper;
import com.moral.service.ProfessionService;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;

import javax.annotation.Resource;
import java.util.List;
@@ -13,7 +15,14 @@

    @Resource
    private ProfessionMapper professionMapper;

    @Override
    public List<Profession> queryByName(String nameLike){
        Example example = new Example(Profession.class);
        if(!StringUtils.isNullOrEmpty(nameLike)){
            example.or().andLike("name",nameLike);
        }
        return professionMapper.selectByExample(example);
    }
    @Override
    public List<Profession> getProfessiontList() {


 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -93,6 +93,9 @@
                     <if test='"DEVICE"==dataCondition.areaRange.toString()'>

                        and dev.id = #{dataCondition.areaRangeId}

                     </if>

                    <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>

                        and dev.profession_id = #{dataCondition.dimensionValue}

                    </if>

                    <if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>

                        and mpt.id = #{dataCondition.areaRangeId}

                    </if>