|
@@ -45,6 +45,8 @@ public class UserController extends BaseController {
|
|
|
private LampService lampService;
|
|
|
@Autowired
|
|
|
private LampPoleService lampPoleService;
|
|
|
+ @Autowired
|
|
|
+ private UserSearchService userSearchService;
|
|
|
|
|
|
/**
|
|
|
* 登录demo做测试,后续删除
|
|
@@ -1193,4 +1195,45 @@ public class UserController extends BaseController {
|
|
|
globalLocationVO.setList(list);
|
|
|
return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version, globalLocationVO);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 添加搜索历史
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/saveSearchInfo", method = RequestMethod.POST)
|
|
|
+ public BaseResult<?> saveSearchInfo(UserSearchVO userSearchVO) {
|
|
|
+ Integer version = userSearchVO.getVersion();
|
|
|
+ List<Map<String, String>> list = userSearchVO.getList();
|
|
|
+ if (list == null || list.isEmpty())
|
|
|
+ return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR, version);
|
|
|
+ UserDTO userDTO = userService.getUserByUserName(userSearchVO.getUsername());
|
|
|
+ if (userDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL, version);
|
|
|
+ for (Map<String, String> map : list) {
|
|
|
+ UserSearchDTO userSearchDTO = new UserSearchDTO();
|
|
|
+ String areaId = map.get("id");
|
|
|
+ if (areaId == null || areaId.isEmpty()) continue;
|
|
|
+ userSearchDTO.setAreaId(Integer.parseInt(areaId));
|
|
|
+ String name = map.get("name");
|
|
|
+ if (name == null || name.isEmpty()) continue;
|
|
|
+ userSearchService.delUserSearchByAreaIdAndUserid(Integer.valueOf(areaId), userDTO.getId());
|
|
|
+ userSearchDTO.setName(name);
|
|
|
+ userSearchDTO.setNumber(Integer.parseInt(map.get("number")));
|
|
|
+ userSearchDTO.setUserid(userDTO.getId());
|
|
|
+ userSearchService.addUserSearchData(userSearchDTO);
|
|
|
+ }
|
|
|
+
|
|
|
+ return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取搜索历史列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/getSearchInfo", method = RequestMethod.POST)
|
|
|
+ public BaseResult<?> getSearchInfo(BaseVO baseVO) {
|
|
|
+ Integer version = baseVO.getVersion();
|
|
|
+ UserDTO userDTO = userService.findUserByUserName(baseVO.getUsername());
|
|
|
+ List<UserSearchDTO> list = userSearchService.getUserSearchList(userDTO.getId());
|
|
|
+ UserSearchDTO userSearchDTO = new UserSearchDTO();
|
|
|
+ userSearchDTO.setList(list);
|
|
|
+ return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version, userSearchDTO);
|
|
|
+ }
|
|
|
}
|