| | |
| | | package com.zy.asrs.controller; |
| | | |
| | | import com.alibaba.fastjson.JSON; |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.baomidou.mybatisplus.plugins.Page; |
| | | import com.core.annotations.ManagerAuth; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.asrs.domain.enums.CrnStatusType; |
| | | import com.zy.asrs.domain.enums.SiteStatusType; |
| | | import com.zy.asrs.domain.enums.StationStatusType; |
| | | import com.zy.asrs.domain.param.SystemSwitchParam; |
| | | import com.zy.asrs.domain.vo.*; |
| | | import com.zy.asrs.entity.BasDevp; |
| | | import com.zy.asrs.entity.WrkMast; |
| | | import com.zy.asrs.service.BasDevpService; |
| | | import com.zy.asrs.service.WrkMastService; |
| | | import com.zy.asrs.domain.vo.CrnDetailVo; |
| | | import com.zy.asrs.domain.vo.CrnLatestDataVo; |
| | | import com.zy.asrs.domain.vo.StationLatestDataVo; |
| | | import com.zy.asrs.domain.vo.RgvLatestDataVo; |
| | | import com.zy.asrs.entity.*; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.common.CodeRes; |
| | | import com.zy.common.utils.RedisUtil; |
| | | import com.zy.core.cache.SlaveConnection; |
| | | import com.zy.core.enums.CrnModeType; |
| | | import com.zy.core.enums.RedisKeyType; |
| | | import com.zy.core.enums.RgvStatusType; |
| | | import com.zy.core.enums.SlaveType; |
| | | import com.zy.core.model.CrnSlave; |
| | | import com.zy.core.model.DevpSlave; |
| | | import com.zy.core.enums.WrkIoType; |
| | | import com.zy.core.model.protocol.CrnProtocol; |
| | | import com.zy.core.model.protocol.StaProtocol; |
| | | import com.zy.core.properties.SlaveProperties; |
| | | import com.zy.core.model.protocol.StationProtocol; |
| | | import com.zy.core.properties.SystemProperties; |
| | | import com.zy.core.thread.CrnThread; |
| | | import com.zy.core.thread.DevpThread; |
| | | import com.zy.core.thread.StationThread; |
| | | import com.zy.core.thread.RgvThread; |
| | | import com.zy.core.model.protocol.RgvProtocol; |
| | | |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.PostMapping; |
| | | import org.springframework.web.bind.annotation.RequestMapping; |
| | | import org.springframework.web.bind.annotation.RequestParam; |
| | | import org.springframework.web.bind.annotation.RestController; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.*; |
| | | import java.util.concurrent.atomic.AtomicInteger; |
| | | |
| | | /** |
| | | * 主控图接口 |
| | | * Created by vincent on 2020-06-01 |
| | | */ |
| | | @Slf4j |
| | | @RestController |
| | |
| | | public class ConsoleController { |
| | | |
| | | @Autowired |
| | | private SlaveProperties slaveProperties; |
| | | private DeviceConfigService deviceConfigService; |
| | | @Autowired |
| | | private WrkMastService wrkMastService; |
| | | @Autowired |
| | | private BasDevpService basDevpService; |
| | | |
| | | public static AtomicInteger integer = new AtomicInteger(); |
| | | private BasCrnpErrService basCrnpErrService; |
| | | @Autowired |
| | | private WrkLastnoService wrkLastnoService; |
| | | @Autowired |
| | | private RedisUtil redisUtil; |
| | | @Autowired |
| | | private LocMastService locMastService; |
| | | |
| | | @PostMapping("/system/running/status") |
| | | @ManagerAuth(memo = "系统运行状态") |
| | | public R systemRunningStatus(){ |
| | | public R systemRunningStatus() { |
| | | return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get())); |
| | | } |
| | | |
| | | @PostMapping("/system/switch") |
| | | @ManagerAuth(memo = "系统运行开关操作") |
| | | public R systemSwitch(SystemSwitchParam param) throws InterruptedException { |
| | | if (Cools.isEmpty(param.getOperatorType())){ |
| | | if (Cools.isEmpty(param.getOperatorType())) { |
| | | return R.error(); |
| | | } |
| | | if (param.getOperatorType() == 0) { |
| | | if (Cools.isEmpty(param.getPassword())){ |
| | | if (Cools.isEmpty(param.getPassword())) { |
| | | return R.error("请输入口令"); |
| | | } |
| | | if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){ |
| | | if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)) { |
| | | return R.error("口令错误"); |
| | | } |
| | | } |
| | | Thread.sleep(2000L); |
| | | SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE); |
| | | Thread.sleep(200L); |
| | | SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType() == 1 ? Boolean.TRUE : Boolean.FALSE); |
| | | return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get())); |
| | | } |
| | | |
| | | /****************************************************************/ |
| | | /************************** 实时数据 ******************************/ |
| | | /****************************************************************/ |
| | | |
| | | @PostMapping("/latest/data/site") |
| | | @PostMapping("/latest/data/station") |
| | | @ManagerAuth(memo = "站点实时数据") |
| | | public R siteLatestData(){ |
| | | List<SiteLatestDataVo> vos = new ArrayList<>(); |
| | | Map<Integer, StaProtocol> stations = new HashMap<>(); |
| | | for (DevpSlave devp : slaveProperties.getDevp()) { |
| | | DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); |
| | | if (null != devpThread) { |
| | | stations.putAll(devpThread.getStation()); |
| | | public R stationLatestData() { |
| | | List<StationLatestDataVo> vos = new ArrayList<>(); |
| | | |
| | | WrkLastno inTaskRange = wrkLastnoService.selectById(WrkIoType.IN.id); |
| | | WrkLastno outTaskRange = wrkLastnoService.selectById(WrkIoType.OUT.id); |
| | | |
| | | List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>() |
| | | .eq("device_type", String.valueOf(SlaveType.Devp))); |
| | | for (DeviceConfig deviceConfig : devpList) { |
| | | StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, |
| | | deviceConfig.getDeviceNo()); |
| | | if (stationThread == null) { |
| | | continue; |
| | | } |
| | | } |
| | | for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) { |
| | | SiteLatestDataVo vo = new SiteLatestDataVo(); |
| | | StaProtocol staProtocol = entry.getValue(); |
| | | vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号 |
| | | vo.setWorkNo(staProtocol.getWorkNo()); // 工作号 |
| | | vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 状态 |
| | | vos.add(vo); |
| | | |
| | | List<StationProtocol> statusList = stationThread.getStatus(); |
| | | if (statusList == null || statusList.isEmpty()) { |
| | | continue; |
| | | } |
| | | for (StationProtocol stationProtocol : statusList) { |
| | | StationLatestDataVo vo = new StationLatestDataVo(); |
| | | vo.setStationId(stationProtocol.getStationId()); // 站点编号 |
| | | vo.setTaskNo(stationProtocol.getTaskNo()); // 任务号 |
| | | vo.setTargetStaNo(stationProtocol.getTargetStaNo()); // 目标站点 |
| | | vo.setAutoing(stationProtocol.isAutoing()); // 是否自动 |
| | | vo.setLoading(stationProtocol.isLoading()); // 是否有物 |
| | | vo.setInEnable(stationProtocol.isInEnable()); // 是否可入 |
| | | vo.setOutEnable(stationProtocol.isOutEnable()); // 是否可出 |
| | | vo.setEmptyMk(stationProtocol.isEmptyMk()); // 是否空板 |
| | | vo.setFullPlt(stationProtocol.isFullPlt()); // 是否满板 |
| | | vo.setPalletHeight(stationProtocol.getPalletHeight()); // 托盘高度 |
| | | vo.setError(stationProtocol.getError()); // 错误码 |
| | | vo.setBarcode(stationProtocol.getBarcode()); // 条码 |
| | | String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-"); |
| | | if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0) { |
| | | String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange); |
| | | if (taskClass != null) { |
| | | stationStatus = taskClass; |
| | | } |
| | | } |
| | | vo.setStationStatus(stationStatus); |
| | | vos.add(vo); |
| | | } |
| | | |
| | | } |
| | | return R.ok().add(vos); |
| | | } |
| | | |
| | | private String getStationTaskClass(Integer taskNo, WrkLastno inTaskRange, WrkLastno outTaskRange) { |
| | | if (taskNo == null || taskNo <= 0) { |
| | | return null; |
| | | } |
| | | if (isInRange(taskNo, inTaskRange)) { |
| | | return "machine-pakin"; |
| | | } |
| | | if (isInRange(taskNo, outTaskRange)) { |
| | | return "machine-pakout"; |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | private boolean isInRange(Integer taskNo, WrkLastno taskRange) { |
| | | if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) { |
| | | return false; |
| | | } |
| | | return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo(); |
| | | } |
| | | |
| | | @PostMapping("/latest/data/crn") |
| | | @ManagerAuth(memo = "堆垛机实时数据") |
| | | public R crnLatestData(){ |
| | | public R crnLatestData() { |
| | | List<CrnLatestDataVo> vos = new ArrayList<>(); |
| | | for (CrnSlave crn : slaveProperties.getCrn()) { |
| | | |
| | | List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>() |
| | | .eq("device_type", String.valueOf(SlaveType.Crn))); |
| | | for (DeviceConfig deviceConfig : crnList) { |
| | | // 获取堆垛机信息 |
| | | CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); |
| | | CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, deviceConfig.getDeviceNo()); |
| | | if (crnThread == null) { |
| | | log.error("{}号堆垛机连接失败", crn.getId()); |
| | | continue; |
| | | } |
| | | CrnProtocol crnProtocol = crnThread.getCrnProtocol(); |
| | | |
| | | CrnProtocol crnProtocol = crnThread.getStatus(); |
| | | if (crnProtocol == null) { |
| | | continue; |
| | | } |
| | | CrnLatestDataVo vo = new CrnLatestDataVo(); |
| | | vo.setCrnId(crn.getId()); // 堆垛机编号 |
| | | vo.setOffset((double) new Random().nextInt(560)); // 堆垛机偏移量 |
| | | vo.setCrnId(crnProtocol.getCrnNo()); // 堆垛机编号 |
| | | |
| | | // 使用实际列值作为偏移参考,避免随机坐标导致界面漂移 |
| | | vo.setOffset(Double.valueOf(crnProtocol.getBay())); |
| | | vo.setBay(crnProtocol.getBay()); // 当前列 |
| | | vo.setTaskNo(crnProtocol.getTaskNo()); |
| | | /** |
| | | * 堆垛机状态判断 |
| | | */ |
| | | if (crnProtocol.getTaskNo()>0) { |
| | | WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); |
| | | if (wrkMast != null) { |
| | | vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType())); |
| | | } |
| | | if (crnProtocol.getAlarm() > 0) { |
| | | vo.setCrnStatus(CrnStatusType.MACHINE_ERROR); |
| | | } else { |
| | | vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO); |
| | | if (crnProtocol.getTaskNo() > 0) { |
| | | WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); |
| | | if (wrkMast != null) { |
| | | vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType())); |
| | | } else { |
| | | vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO |
| | | : CrnStatusType.MACHINE_UN_AUTO); |
| | | } |
| | | } else { |
| | | vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO |
| | | : CrnStatusType.MACHINE_UN_AUTO); |
| | | } |
| | | } |
| | | vos.add(vo); |
| | | |
| | | } |
| | | return R.ok().add(vos); |
| | | } |
| | | |
| | | @PostMapping("/latest/data/barcode") |
| | | @ManagerAuth(memo = "条码扫描仪实时数据") |
| | | public R barcodeLatestData(){ |
| | | integer.getAndIncrement(); |
| | | List<BarcodeDataVo> list = new ArrayList<>(); |
| | | for (int i=1;i<=1;i++){ |
| | | BarcodeDataVo vo = new BarcodeDataVo(); |
| | | vo.setBarcodeId("1"); |
| | | if (integer.get()%5 != 0) { |
| | | vo.setCodeValue("0"); |
| | | } else { |
| | | vo.setCodeValue(String.valueOf(new Random().nextInt(5000))); |
| | | @PostMapping("/latest/data/rgv") |
| | | @ManagerAuth(memo = "RGV实时数据") |
| | | public R rgvLatestData(){ |
| | | List<RgvLatestDataVo> vos = new ArrayList<>(); |
| | | List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>() |
| | | .eq("device_type", String.valueOf(SlaveType.Rgv))); |
| | | for (DeviceConfig deviceConfig : rgvList) { |
| | | RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, deviceConfig.getDeviceNo()); |
| | | if (rgvThread == null) { |
| | | continue; |
| | | } |
| | | list.add(vo); |
| | | RgvProtocol rgvProtocol = rgvThread.getStatus(); |
| | | if (rgvProtocol == null) { |
| | | continue; |
| | | } |
| | | RgvLatestDataVo vo = new RgvLatestDataVo(); |
| | | vo.setRgvNo(rgvProtocol.getRgvNo()); |
| | | vo.setTaskNo(rgvProtocol.getTaskNo()); |
| | | vo.setTrackSiteNo(String.valueOf(rgvProtocol.getRgvPos())); |
| | | vo.setRgvStatus(RgvStatusType.get(rgvProtocol.getStatus())); |
| | | vos.add(vo); |
| | | } |
| | | return R.ok().add(list); |
| | | return R.ok().add(vos); |
| | | } |
| | | |
| | | /****************************************************************/ |
| | | /************************** 详情操作 ******************************/ |
| | | /****************************************************************/ |
| | | |
| | | @PostMapping("/site/detail") |
| | | @ManagerAuth(memo = "输送设备数据详情") |
| | | public R siteDetail(@RequestParam Integer siteId){ |
| | | if (Cools.isEmpty(siteId)){ |
| | | return R.parse(CodeRes.EMPTY); |
| | | } |
| | | SiteDetailVo vo = new SiteDetailVo(); |
| | | for (DevpSlave devp : slaveProperties.getDevp()) { |
| | | DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); |
| | | if (null != devpThread) { |
| | | StaProtocol staProtocol = devpThread.getStation().get(siteId); |
| | | if (staProtocol != null) { |
| | | BasDevp basDevp = basDevpService.selectById(siteId); |
| | | if (basDevp == null) { |
| | | return R.error("数据库维护异常"); |
| | | } |
| | | vo.setSiteId(siteId); // 站点编号 |
| | | vo.setWorkNo(staProtocol.getWorkNo()); // 工作号 |
| | | |
| | | if (staProtocol.getWorkNo() > 0) { |
| | | WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo()); |
| | | if (wrkMast != null) { |
| | | vo.setWrkSts(wrkMast.getWrkSts$()); // 工作状态 |
| | | vo.setIoType(wrkMast.getIoType$()); // 入出库类型 |
| | | vo.setSourceStaNo(wrkMast.getSourceStaNo$()); |
| | | vo.setStaNo(wrkMast.getStaNo$()); |
| | | vo.setSourceLocNo(wrkMast.getSourceLocNo$()); |
| | | vo.setLocNo(wrkMast.getLocNo$()); |
| | | } |
| | | } |
| | | |
| | | vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 自动 |
| | | vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 有物 |
| | | |
| | | vo.setCanining(basDevp.getCanining()); // 能入 |
| | | vo.setCanouting(basDevp.getCanouting()); // 能出 |
| | | |
| | | return R.ok().add(vo); |
| | | } |
| | | } |
| | | } |
| | | return R.error(); |
| | | |
| | | } |
| | | // @PostMapping("/latest/data/barcode") |
| | | // @ManagerAuth(memo = "条码扫描仪实时数据") |
| | | // public R barcodeLatestData(){ |
| | | // List<BarcodeDataVo> list = new ArrayList<>(); |
| | | // for (Slave barcode : slaveProperties.getBarcode()) { |
| | | // BarcodeThread barcodeThread = (BarcodeThread) |
| | | // SlaveConnection.get(SlaveType.Barcode, barcode.getId()); |
| | | // if (null == barcodeThread) { |
| | | // continue; |
| | | // } |
| | | // BarcodeDataVo vo = new BarcodeDataVo(); |
| | | // vo.setBarcodeId(barcode.getId()); |
| | | // vo.setCodeValue(barcodeThread.getBarcode()); |
| | | // list.add(vo); |
| | | // } |
| | | // return R.ok().add(list); |
| | | // } |
| | | |
| | | @PostMapping("/crn/detail") |
| | | @ManagerAuth(memo = "堆垛机设备数据详情") |
| | | public R crnDetail(@RequestParam String crnNo){ |
| | | if (Cools.isEmpty(crnNo)){ |
| | | public R crnDetail(@RequestParam Integer crnNo) { |
| | | if (Cools.isEmpty(crnNo)) { |
| | | return R.parse(CodeRes.EMPTY); |
| | | } |
| | | CrnDetailVo vo = new CrnDetailVo(); |
| | | |
| | | DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>() |
| | | .eq("device_type", String.valueOf(SlaveType.Crn)) |
| | | .eq("device_no", crnNo)); |
| | | |
| | | if (deviceConfig == null) { |
| | | return R.error("设备不存在"); |
| | | } |
| | | |
| | | CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo); |
| | | CrnProtocol crnProtocol = crnThread.getStatus(); |
| | | vo.setCrnNo(crnNo); |
| | | vo.setWorkNo("3387"); |
| | | vo.setSourceStaNo("2303"); |
| | | vo.setStaNo("2410"); |
| | | vo.setWorkStatus("3.吊车入库中"); |
| | | vo.setIoType("1.入库"); |
| | | vo.setSourceStock(""); |
| | | vo.setStock("05050040"); |
| | | vo.setCrnStatus("取货中"); |
| | | vo.setError("0"); |
| | | vo.setWorkNo(crnProtocol.getTaskNo()); |
| | | vo.setCrnStatus(crnProtocol.getStatusType().desc); |
| | | |
| | | if (crnProtocol.getAlarm() > 0) { |
| | | BasCrnpErr crnError = basCrnpErrService.selectById(crnProtocol.getAlarm()); |
| | | vo.setError(crnError == null ? "未知异常" : crnError.getErrName()); |
| | | } |
| | | |
| | | if (crnProtocol.getTaskNo() > 0) { |
| | | WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); |
| | | if (wrkMast != null) { |
| | | vo.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo())); |
| | | vo.setStaNo(String.valueOf(wrkMast.getStaNo())); |
| | | vo.setWrkSts(wrkMast.getWrkSts$()); // 工作状态 |
| | | vo.setIoType(wrkMast.getIoType$()); // 入出库类型 |
| | | vo.setSourceLocNo(wrkMast.getSourceLocNo$()); |
| | | vo.setLocNo(wrkMast.getLocNo$()); |
| | | vo.setCrnStatus(crnProtocol.getStatusType().desc); |
| | | vo.setError(""); // todo |
| | | } |
| | | } |
| | | return R.ok().add(vo); |
| | | } |
| | | |
| | | @Deprecated |
| | | @PostMapping("/site/update") |
| | | @ManagerAuth(memo = "输送设备数据修改") |
| | | public R updateSite(){ |
| | | return R.ok(); |
| | | /** |
| | | * 获取地图楼层数据 |
| | | */ |
| | | @GetMapping("/map/lev/list") |
| | | @ManagerAuth |
| | | public R getMapLevList() { |
| | | List<Integer> levList = locMastService.getLevList(); |
| | | return R.ok().add(levList); |
| | | } |
| | | |
| | | @Deprecated |
| | | @PostMapping("/crn/update") |
| | | @ManagerAuth(memo = "堆垛机数据修改") |
| | | public R updateCrn(){ |
| | | return R.ok(); |
| | | /** |
| | | * 获取地图数据 |
| | | */ |
| | | @GetMapping("/map/{lev}/auth") |
| | | public R getLocMap(@PathVariable Integer lev) { |
| | | Object object = redisUtil.get(RedisKeyType.LOC_MAP_BASE.key); |
| | | if (object == null) { |
| | | return R.error("地图未初始化"); |
| | | } |
| | | List<List<HashMap<String, Object>>> mapNodeList = (List<List<HashMap<String, Object>>>) object; |
| | | List<LocMast> locMastList = locMastService.selectLocByLev(lev); |
| | | for (LocMast locMast : locMastList) { |
| | | String[] locType = locMast.getLocType().split("-"); |
| | | HashMap<String, Object> mapNode = mapNodeList.get(Integer.parseInt(locType[0])).get(Integer.parseInt(locType[1])); |
| | | mapNode.put("locSts", locMast.getLocSts()); |
| | | mapNode.put("locNo", locMast.getLocNo()); |
| | | } |
| | | return R.ok().add(mapNodeList); |
| | | } |
| | | |
| | | @RequestMapping(value = "/map/locList") |
| | | public R mapLocList() { |
| | | Object object = redisUtil.get(RedisKeyType.LOC_MAST_MAP_LIST.key); |
| | | if (object != null) { |
| | | JSONArray data = JSON.parseArray(object.toString()); |
| | | return R.ok().add(data); |
| | | } |
| | | EntityWrapper<LocMast> wrapper = new EntityWrapper<>(); |
| | | wrapper.eq("lev1", 1); |
| | | List<LocMast> locMasts = locMastService.selectList(wrapper); |
| | | redisUtil.set(RedisKeyType.LOC_MAST_MAP_LIST.key, JSON.toJSONString(locMasts), 60 * 60 * 24); |
| | | return R.ok().add(locMasts); |
| | | } |
| | | |
| | | } |