api 更新

fengxiang

2018-06-23 30d2366d51e7d3f3bfdb4652f9d3a07a531d907b

api 更新

 src/main/java/com/moral/common/bean/AppData.java

@@ -12,7 +12,7 @@
    public static final int SUCCESS = 0;

    public static final int FAIL = 1;

    public static final int NO_PERMISSION = 2;

    private String message = "success";

    private String message = "成功";

    private int errno = SUCCESS;

    private T data;




 src/main/java/com/moral/entity/Region.java

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

import com.moral.common.util.StringUtils;
import com.moral.entity.charts.AreaRange;
import lombok.Data;
import org.apache.commons.lang.math.NumberUtils;

@Data
public class Region {
    private AreaRange areaRange;
    private Integer code;
    private  Region(Integer code,AreaRange areaRange){
        this.code = code;
        this.areaRange = areaRange;
    }
    public static Region create(Integer code){
            if(code!=null){
              return  create(code.toString());
            }else {
                return  null;
            }
    }
    public static Region create(String code){
          AreaRange areaRange = Region.determine(code);
          if(areaRange != null) {
              return  new Region(Integer.parseInt(code),areaRange);
          }else {
              return  null;
          }
    }
    public  static AreaRange determine(String code) {
        AreaRange areaRange = null;
        if(!StringUtils.isNullOrEmpty(code)&& NumberUtils.isDigits(code)){
            if(code.length()==6){
                if(code.endsWith("0000")){
                    areaRange = AreaRange.PROVINCE;
                }else if(code.endsWith("00")){
                    areaRange = AreaRange.CITY;
                } else {
                    areaRange = AreaRange.AREA;
                }
            } else if(code.length()==12){
                if(code.endsWith("000")){
                    areaRange = AreaRange.TOWN;
                }else {
                    areaRange = AreaRange.VILLAGE;
                }
            }
        }
        return  areaRange;
    }
}

 src/main/java/com/moral/mapper/OrganizationMapper.java

@@ -10,4 +10,5 @@
public interface OrganizationMapper extends BaseMapper<Organization> {

    List<Organization> selectWithAreaNameByExample(Example example);

    List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);

    List<Integer> selectLowerOrgIds(Integer orgId);

}

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

@@ -32,7 +32,7 @@


@Service

public class DeviceServiceImpl implements DeviceService {

    Logger log = Logger.getLogger(DeviceServiceImpl.class);

    private static Logger log = Logger.getLogger(DeviceServiceImpl.class);

    //-----------------------redis key前缀-开始---------------------------------

    private static String AlARM = "alarm";//警报阀值储存key前缀

    private static String ADJUST="adjust";//校准值存储key前缀


 src/main/resources/mapper/OrganizationMapper.xml

@@ -94,4 +94,7 @@
            AND o.city_code = c.city_code
        </if>
    </select>
    <select id="selectLowerOrgIds" resultType="java.lang.Integer">
            call proc_lowerOrgIds_GetByOrgId(#{orgId,jdbcType=INTEGER});
    </select>
</mapper>