wol/radar
1
0
Fork 0
mirror of https://gitee.com/freshday/radar.git synced 2026-03-22 12:47:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

opts: 代码优化.

Browse Source 
feihu wang
This commit is contained in:
feihu.wang
2021-03-12 15:35:50 +08:00
parent 8a922b78b1
commit ff5330d470
4 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
radar-admin/src/main/java/com/pgmmers/radar/controller/ModelApiController.java
View File

@@ -56,13 +56,7 @@ public class ModelApiController {
@GetMapping("/list")
public CommonResult list(HttpServletRequest request) {
// HttpSession session = request.getSession();
// UserVO user = (UserVO) session.getAttribute("user");
CommonResult result = new CommonResult();
// if (user == null) {
// result.setMsg("session已过期");
// return result;
// }
result.setSuccess(true);
result.getData().put("modelList", modelService.listModel(contextHolder.getContext().getCode(), null));
return result;
@@ -79,14 +73,6 @@ public class ModelApiController {
@PostMapping
public CommonResult query(@RequestBody ModelQuery query, HttpServletRequest request) {
CommonResult result = new CommonResult();
// HttpSession session = request.getSession();
// UserVO user = (UserVO) session.getAttribute("user");
// if (user == null) {
// result.setMsg("session已过期");
// return result;
// }
// query.setMerchantCode(user.getCode());
query.setMerchantCode(contextHolder.getContext().getCode());
return modelService.query(query);
}
@@ -94,9 +80,6 @@ public class ModelApiController {
@PutMapping
public CommonResult save(@RequestBody ModelVO model, HttpServletRequest request) {
// HttpSession session = request.getSession();
// UserVO user = (UserVO) session.getAttribute("user");
// model.setCode(user.getCode());
model.setCode(contextHolder.getContext().getCode());
return modelService.save(model);
}

2
radar-dal/src/main/java/com/pgmmers/radar/dal/model/ModelDal.java
View File

@@ -17,7 +17,7 @@ public interface ModelDal {
List<ModelVO> listModel(String merchantCode,Integer status);
List<ModelVO> listModel(String merchantCode,Integer status, Boolean isTemplate);
List<ModelVO> listModel(String code,Integer status, Boolean isTemplate);
List<ModelVO> listModel(Integer status);

6
radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/ModelDalImpl.java
View File

@@ -445,12 +445,12 @@ public class ModelDalImpl implements ModelDal {
}
@Override
public List<ModelVO> listModel(String merchantCode, Integer status,
public List<ModelVO> listModel(String code, Integer status,
Boolean isTemplate) {
Example example = new Example(ModelPO.class);
Example.Criteria criteria = example.createCriteria();
if (!StringUtils.isEmpty(merchantCode)) {
criteria.andEqualTo("code", merchantCode);
if (!StringUtils.isEmpty(code)) {
criteria.andEqualTo("code", code);
}
if (status != null) {
criteria.andEqualTo("status", status);

9
radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/ModelServiceImpl.java
View File

@@ -43,10 +43,6 @@ import org.springframework.stereotype.Service;
public class ModelServiceImpl extends BaseLocalCacheService implements ModelService,
SubscribeHandle {
@Override
public Object query(Long modelId) {
return modelDal.getModelById(modelId);
}
public static Logger logger = LoggerFactory
.getLogger(ModelServiceImpl.class);
@@ -367,4 +363,9 @@ public class ModelServiceImpl extends BaseLocalCacheService implements ModelServ
return modelDal.listModel(null, null, true);
}
@Override
public Object query(Long modelId) {
return modelDal.getModelById(modelId);
}
}