Junjie
昨天 a4f07b2a0ddb6c210e05afbbb491feeb466203e7
src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
@@ -44,7 +44,7 @@
        Map<String, Object> data = new HashMap<>();
        List<Integer> stationIds = new ArrayList<>();
        List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().eq("status", 1));
        List<BasDevp> devps = basDevpService.list(new QueryWrapper<BasDevp>().eq("status", 1));
        for (BasDevp devp : devps) {
            for (StationObjModel stationObjModel : devp.getOutStationList$()) {
                stationIds.add(stationObjModel.getStationId());
@@ -52,13 +52,13 @@
        }
        List<BasStation> stations = stationIds.isEmpty()
                ? new ArrayList<>()
                : basStationService.selectList(new EntityWrapper<BasStation>().in("station_id", stationIds));
                : basStationService.list(new QueryWrapper<BasStation>().in("station_id", stationIds));
        data.put("stations", stations);
        List<BasOutArea> areas = basOutAreaService.selectList(new EntityWrapper<>());
        List<BasOutArea> areas = basOutAreaService.list(new QueryWrapper<>());
        data.put("areas", areas);
        List<BasOutStationArea> relations = basOutStationAreaService.selectList(new EntityWrapper<>());
        List<BasOutStationArea> relations = basOutStationAreaService.list(new QueryWrapper<>());
        data.put("relations", relations);
        return R.ok(data);
@@ -70,8 +70,8 @@
        JSONArray areas = payload.getJSONArray("areas");
        JSONArray relations = payload.getJSONArray("relations");
        basOutAreaService.delete(new EntityWrapper<>());
        basOutStationAreaService.delete(new EntityWrapper<>());
        basOutAreaService.remove(new QueryWrapper<>());
        basOutStationAreaService.remove(new QueryWrapper<>());
        if (areas != null && !areas.isEmpty()) {
            List<BasOutArea> areaList = new ArrayList<>();
@@ -83,7 +83,7 @@
                areaList.add(a);
            }
            if (!areaList.isEmpty()) {
                basOutAreaService.insertBatch(areaList);
                basOutAreaService.saveBatch(areaList);
            }
        }
@@ -97,7 +97,7 @@
                relList.add(r);
            }
            if (!relList.isEmpty()) {
                basOutStationAreaService.insertBatch(relList);
                basOutStationAreaService.saveBatch(relList);
            }
        }