From 30d2366d51e7d3f3bfdb4652f9d3a07a531d907b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:10:16 +0800
Subject: [PATCH] api 更新
---
src/main/java/com/moral/common/bean/AppData.java | 2 +-
src/main/java/com/moral/entity/Region.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/moral/mapper/OrganizationMapper.java | 1 +
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 2 +-
src/main/resources/mapper/OrganizationMapper.xml | 3 +++
5 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/AppData.java b/src/main/java/com/moral/common/bean/AppData.java
index a1d12d0..a35fa42 100644
--- a/src/main/java/com/moral/common/bean/AppData.java
+++ b/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;
diff --git a/src/main/java/com/moral/entity/Region.java b/src/main/java/com/moral/entity/Region.java
new file mode 100644
index 0000000..2a83911
--- /dev/null
+++ b/src/main/java/com/moral/entity/Region.java
@@ -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;
+ }
+}
diff --git a/src/main/java/com/moral/mapper/OrganizationMapper.java b/src/main/java/com/moral/mapper/OrganizationMapper.java
index 242b71c..0bf3158 100644
--- a/src/main/java/com/moral/mapper/OrganizationMapper.java
+++ b/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);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 4213c13..33ff1b4 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/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������
diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index 1e58531..982b7a2 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.8.0