Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-06 e2411fee13ff406db4aa5d994d7dcffdf4482cab

 screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java

@@ -2,6 +2,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.Date;
import java.util.List;
@@ -40,17 +41,14 @@
     */
    @Override
    public Integer interCoordinate(Map<String, Object> params) {
//        String mac = params.get("mac").toString();
        String mac ="p5dnd7a0243625";
        String mac = params.get("mac").toString();
        QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
        wrapper.eq("mac",mac);
        wrapper.eq("is_delete","0");
        SpecialDevice specialDevice = specialDeviceMapper.selectOne(wrapper);
        String startPoint = params.get("startPoint").toString();
        String endPoint = params.get("endPoint").toString();
        QueryWrapper<ManageCoordinate> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("start_point",startPoint);
        queryWrapper.eq("end_point",endPoint);
        Integer integer = manageCoordinateMapper.selectCount(queryWrapper);
        if (integer>=1){
            return null;
@@ -59,7 +57,6 @@
        manageCoordinate.setCreateTime(new Date());
        manageCoordinate.setUpdateTime(new Date());
        manageCoordinate.setStartPoint(startPoint);
        manageCoordinate.setEndPoint(endPoint);
        manageCoordinate.setIsDel(0);
        manageCoordinate.setOrganizationId(specialDevice.getOrganizationId());
        int code = manageCoordinateMapper.insert(manageCoordinate);
@@ -93,9 +90,22 @@
     * @return
     */
    @Override
    public List<ManageCoordinate> selectCoordinate() {
    public List<ManageCoordinate> selectCoordinate(String name,String mac) {

        QueryWrapper<ManageCoordinate> queryWrapper = new QueryWrapper<>();

        if (!ObjectUtils.isEmpty(name)){
            queryWrapper.like("start_point",name);
        }
        if(!ObjectUtils.isEmpty(mac)){
            QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
            wrapper.eq("mac",mac);
            wrapper.eq("is_delete","0");
            SpecialDevice specialDevice = specialDeviceMapper.selectOne(wrapper);
            queryWrapper.eq("organization_id",specialDevice.getOrganizationId());
        }
        queryWrapper.eq("is_del",0);
        queryWrapper.orderByDesc("coordinate_id");
        List<ManageCoordinate> manageCoordinates = manageCoordinateMapper.selectList(queryWrapper);
        return manageCoordinates;
    }