|
@@ -33,6 +33,7 @@ import com.cloudcross.ssp.common.utils.SqlHelper;
|
|
import com.cloudcross.ssp.model.Account;
|
|
import com.cloudcross.ssp.model.Account;
|
|
import com.cloudcross.ssp.model.Location;
|
|
import com.cloudcross.ssp.model.Location;
|
|
import com.cloudcross.ssp.model.Log;
|
|
import com.cloudcross.ssp.model.Log;
|
|
|
|
+import com.cloudcross.ssp.model.PlaceClassInformation;
|
|
import com.cloudcross.ssp.model.PlaceOperator;
|
|
import com.cloudcross.ssp.model.PlaceOperator;
|
|
import com.cloudcross.ssp.model.Wifi;
|
|
import com.cloudcross.ssp.model.Wifi;
|
|
import com.cloudcross.ssp.service.ILocationService;
|
|
import com.cloudcross.ssp.service.ILocationService;
|
|
@@ -272,12 +273,12 @@ public class ApmacController extends SimpleController {
|
|
*/
|
|
*/
|
|
@RequestMapping("/placeClassName")
|
|
@RequestMapping("/placeClassName")
|
|
public @ResponseBody
|
|
public @ResponseBody
|
|
- List<Map<Long, String>> placeName(@RequestParam Long operatorId) {
|
|
|
|
|
|
+ List<PlaceClassInformation> placeName(@RequestParam Long operatorId) {
|
|
if(null == operatorId) {
|
|
if(null == operatorId) {
|
|
System.out.println("传递的参数为空");
|
|
System.out.println("传递的参数为空");
|
|
- return null;
|
|
|
|
|
|
+ return (new ArrayList<PlaceClassInformation>());
|
|
}
|
|
}
|
|
- List<Map<Long, String>> placeClassNameList = placeClassInformationService.findPlaceClassByOperatorId(operatorId);
|
|
|
|
|
|
+ List<PlaceClassInformation> placeClassNameList = placeClassInformationService.findPlaceClassByOperatorId(operatorId);
|
|
return placeClassNameList;
|
|
return placeClassNameList;
|
|
}
|
|
}
|
|
|
|
|