blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
14 小时以前 e711c834aec2293c53b07efe53e81e3573c289b6 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -21,6 +21,7 @@


import com.vincent.rsf.server.manager.entity.*;


import com.vincent.rsf.server.manager.mapper.*;


import com.vincent.rsf.server.manager.service.*;


import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;


import com.vincent.rsf.server.system.constant.CodeRes;


import com.vincent.rsf.server.system.constant.GlobalConfigCode;


import com.vincent.rsf.server.system.constant.SerialRuleCode;


@@ -38,8 +39,8 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import jakarta.annotation.Resource;


import jakarta.servlet.http.HttpServletRequest;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


@@ -131,6 +132,7 @@


    private BasContainerService basContainerService;


    @Resource


    private UserRoleService userRoleService;


    private BasStationServiceImpl basStationService;




    /**


     * @return


@@ -1180,11 +1182,12 @@


     */


    @Override


    public R getDeviceSites() {


        List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()


                .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)


                .eq(DeviceSite::getStatus, 1)


                .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));


        return R.ok(sites);


//        List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()


//                .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)


//                .eq(DeviceSite::getStatus, 1)


//                .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));


        List<BasStation> basStationList = basStationService.list(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStatus, 1));


        return R.ok(basStationList);


    }




    /**


@@ -1214,7 +1217,7 @@


        }


        GenerateTaskParams taskParams = new GenerateTaskParams();


        taskParams.setWaitPakins(waitPakins)


                .setSiteId(Long.parseLong(map.get("site").toString()))


                .setSiteNo(map.get("siteNo").toString())


                .setLocCode(map.get("locCode").toString());


        return R.ok(taskService.generateTasks(taskParams, loginUserId));




@@ -1289,3 +1292,4 @@


    }




}