Commit fb55d0a2 authored by 赵啸非's avatar 赵啸非

添加区域树结构

parent 0bcba9b8
...@@ -45,7 +45,7 @@ fi ...@@ -45,7 +45,7 @@ fi
if [ -e "$BASEDIR" ] if [ -e "$BASEDIR" ]
then then
JAVA_OPTS="-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH" JAVA_OPTS="-Xms1024M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
fi fi
CLASSPATH=$CLASSPATH_PREFIX: CLASSPATH=$CLASSPATH_PREFIX:
......
...@@ -60,5 +60,5 @@ public interface AreaService extends ICRUDCacheService<AreaEntity,Long> { ...@@ -60,5 +60,5 @@ public interface AreaService extends ICRUDCacheService<AreaEntity,Long> {
* @param context * @param context
* @return * @return
*/ */
List<AreaTreeSelect> getListByRootId(Long rootId, Context context); List<AreaTreeSelect> getListByRootId(String rootId, Context context);
} }
\ No newline at end of file
...@@ -182,12 +182,12 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE ...@@ -182,12 +182,12 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
} }
@Override @Override
public List<AreaTreeSelect> getListByRootId(Long rootId, Context context) { public List<AreaTreeSelect> getListByRootId(String rootId, Context context) {
if (ObjectUtils.isEmpty(rootId)) { if (ObjectUtils.isEmpty(rootId)) {
rootId = 0L; rootId = "0";
} }
AreaEntity areaEntity = this.selectOne(new AreaQuery().pid(rootId.toString())); AreaEntity areaEntity = this.selectOne(new AreaQuery().pid(rootId));
AreaTreeSelect areaTreeSelect = new AreaTreeSelect(areaEntity); AreaTreeSelect areaTreeSelect = new AreaTreeSelect(areaEntity);
......
...@@ -103,7 +103,7 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic ...@@ -103,7 +103,7 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic
*/ */
@GetMapping(value = "getListByRootId") @GetMapping(value = "getListByRootId")
@UnAuth @UnAuth
public String getListByRootId(Long rootId) { public String getListByRootId(String rootId) {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
Map<String, Object> model = new HashMap<>(); Map<String, Object> model = new HashMap<>();
String busiDesc = "查询" + this.getModuleDesc() + "子节点"; String busiDesc = "查询" + this.getModuleDesc() + "子节点";
......
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