Commit 30051eb3 authored by 周健威's avatar 周健威

修改代码

parent caa70521
package com.github.wxiaoqi.security.common.rest; package com.github.wxiaoqi.security.common.rest;
import cn.hutool.core.util.StrUtil;
import com.github.wxiaoqi.security.common.context.BaseContextHandler; import com.github.wxiaoqi.security.common.context.BaseContextHandler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -37,4 +38,8 @@ public class CommonBaseController { ...@@ -37,4 +38,8 @@ public class CommonBaseController {
public String getCurrentUserId(){ public String getCurrentUserId(){
return BaseContextHandler.getUserID(); return BaseContextHandler.getUserID();
} }
public Integer getCurrentUserIdInt(){
return StrUtil.isBlank(getCurrentUserId()) ? null : Integer.valueOf(getCurrentUserId());
}
} }
...@@ -45,7 +45,7 @@ public class RscpStorageJson implements java.io.Serializable { ...@@ -45,7 +45,7 @@ public class RscpStorageJson implements java.io.Serializable {
/** json文本 */ /** json文本 */
@ApiModelProperty(value = "用户Id") @ApiModelProperty(value = "用户Id")
private String userId; private Integer userId;
@ApiModelProperty(value = "逻辑删除") @ApiModelProperty(value = "逻辑删除")
......
...@@ -24,7 +24,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB ...@@ -24,7 +24,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> { List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> {
w.andEqualTo(RscpMonitorimage::getStatus, 2); w.andEqualTo(RscpMonitorimage::getStatus, 2);
return w; return w;
}, "create_time asc"); }, "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[]},\"properties\":{\"id\":\"\",\"val\":\"\",\"marker\":{},\"subType\":\"Circle\",\"radius\":100}}");
return ObjectRestResponse.succ(list); return ObjectRestResponse.succ(list);
} }
} }
\ No newline at end of file
...@@ -48,10 +48,10 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz ...@@ -48,10 +48,10 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz
AssertUtils.isBlank(rscpStorageJson); AssertUtils.isBlank(rscpStorageJson);
AssertUtils.isBlank(rscpStorageJson.getContextJson()); AssertUtils.isBlank(rscpStorageJson.getContextJson());
rscpStorageJson.setUserId(getCurrentUserId()); rscpStorageJson.setUserId(getCurrentUserIdInt());
//判断会否存在 //判断会否存在
List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{ List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{
setUserId(getCurrentUserId()); setUserId(getCurrentUserIdInt());
setIsDel(SYS_FALSE); setIsDel(SYS_FALSE);
}}); }});
...@@ -72,7 +72,7 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz ...@@ -72,7 +72,7 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz
//判断会否存在 //判断会否存在
List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{ List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{
setUserId(getCurrentUserId()); setUserId(getCurrentUserIdInt());
// setId(rscpStorageJson.getId()); // setId(rscpStorageJson.getId());
setIsDel(SYS_FALSE); setIsDel(SYS_FALSE);
}}); }});
......
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