chore:测试提交

jinpengyong

2023-08-24 a97c42ad398252b9b69cabc3494a45a79064eec8

chore:测试提交

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

@@ -561,7 +561,13 @@
        for (Map<String, Object> map : list) {
            HistoryDaily historyDaily = new HistoryDaily();
            String time = map.remove("time").toString();
            Date date = DateUtils.dateStringToDate(time);
            Date date=null;
            if (time.length()>20){
                date = DateUtils.dateStringToDate(time);
            }else {
                date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            }

            String mac = map.remove("mac").toString();
            String value = JSONObject.toJSONString(map);
            historyDaily.setMac(mac);

 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java

@@ -77,7 +77,10 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        manageCoordinateService.deleteCoordinate(id);
        Integer integer = manageCoordinateService.deleteCoordinate(id);
        if (integer==1){
          return  ResultMessage.ok("删除失败");
        }
        return ResultMessage.ok();
    }


 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java

@@ -43,8 +43,11 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Integer integer = manageCoordinateDetailService.insertCoordinate(params);
        if (integer==null){
        if (integer==1){
            return ResultMessage.ok("经纬度已存在");
        }
        if (integer==2){
            return ResultMessage.ok("经纬度不存在");
        }
        return ResultMessage.ok();
    }
@@ -64,8 +67,11 @@
        if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }

        return null;
        Integer integer = manageCoordinateDetailService.batchAll(params);
        if (integer!=200){
            return ResultMessage.ok("操作失败");
        }
         return ResultMessage.ok();
    }

    /**
@@ -78,20 +84,6 @@
        return null;
    }


    /**
     * 删除经纬度点
     * @param id
     * @return
     */
    @GetMapping("delete")
    public ResultMessage delete(Integer id){
        if (id==null){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        manageCoordinateDetailService.deleteCoordinate(id);
        return ResultMessage.ok();
    }


    /**

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

@@ -12,7 +12,6 @@
    Integer insertCoordinate(Map<String,Object> params);


    void  deleteCoordinate(Integer id);




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

@@ -18,7 +18,7 @@
    void updateCoordinate(ManageCoordinate manageCoordinate);


    void deleteCoordinate(Integer id);
    Integer deleteCoordinate(Integer id);


    List<ManageCoordinate> selectCoordinate();

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

@@ -38,6 +38,7 @@
import com.moral.api.util.RoadUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
import com.sun.org.apache.regexp.internal.RE;

@@ -77,7 +78,8 @@
            ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
            String code = datum.get("code").toString();
            String state = datum.get("state").toString();
            if (state.equals("1")){

            if (state.equals("2")){
                String[] rs = code.split("_");
                manageCoordinateDetail.setCoordinateId(coordinateId);
                manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
@@ -91,25 +93,19 @@
                wrapper.eq("latitude",manageCoordinateDetail.getLatitude());
                Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
                if (integer>=1){
                    return null;
                    return 1;
                }
                manageCoordinateDetailMapper.insert(manageCoordinateDetail);
            }else {
                manageCoordinateDetailMapper.deleteById(manageCoordinateDetail.getId());
                Object id1 = datum.get("id");
                if (ObjectUtils.isEmpty(id1)){
                    return 2;
                }
                manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
//                    manageCoordinateDetailMapper.delete(wrapper);

            }
        }
        return 200;
    }

    /**
     * 删除经纬度点
     * @param id
     */
    @Override
    public void deleteCoordinate(Integer id)  {
        manageCoordinateDetailMapper.deleteById(id);
    }


@@ -178,8 +174,9 @@
                String latitude = manageCoordinateDetail.getLatitude().toString();
                String longitude = manageCoordinateDetail.getLongitude().toString();
                if (latitude.equals(flyLat) && longitude.equals(flyLon)){
                    manageCoordinateDetail.setLongitude(Double.parseDouble(flyLon));
                    manageCoordinateDetail.setLatitude(Double.parseDouble(flyLat));
                    manageCoordinateDetail.setCode(data);
                    manageCoordinateDetail.setLongitude(cruiserDTO.getFlyLon());
                    manageCoordinateDetail.setLatitude(cruiserDTO.getFlyLat());
                    rsList1.add(manageCoordinateDetail);
                    cruiserInfo.remove(i);
                    break;
@@ -205,28 +202,62 @@
        int coordinateId = Integer.parseInt(params.get("coordinateId").toString());
        QueryWrapper<ManageCoordinateDetail> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("coordinate_id",coordinateId);
        String time1 = params.remove("time1").toString();
        String time2 = params.remove("time2").toString();
        long l = DateUtils.compareDateStr(time1, time2);
        if (l>0){
            params.put("time1",time1);
            params.put("time2",time2);
        }else {
            params.put("time1",time2);
            params.put("time2",time1);
        }
        int j =0;
        List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
        List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
        for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
            String latitude = manageCoordinateDetail.getLatitude().toString();
            String longitude = manageCoordinateDetail.getLongitude().toString();
        if (ObjectUtils.isEmpty(manageCoordinateDetails)){
            for (CruiserDTO cruiserDTO : cruiserInfo) {
                Double flyLat = cruiserDTO.getFlyLat();
                Double flyLon = cruiserDTO.getFlyLon();
                if (!latitude.equals(flyLat+"") || !longitude.equals(flyLon+"")){
                    ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
                    rsDTO.setLatitude(flyLat);
                    rsDTO.setLongitude(flyLon);
                    rsDTO.setState("2");
                    rsDTO.setCreateTime(new Date());
                    rsDTO.setUpdateTime(new Date());
                    rsDTO.setCoordinateId(coordinateId);
                    int insert = manageCoordinateDetailMapper.insert(rsDTO);
                    if (insert!=1){
                        return null;
                ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
                rsDTO.setLatitude(flyLat);
                rsDTO.setLongitude(flyLon);
                rsDTO.setState("2");
                rsDTO.setCreateTime(new Date());
                rsDTO.setUpdateTime(new Date());
                rsDTO.setCoordinateId(coordinateId);
                manageCoordinateDetailMapper.insert(rsDTO);
                j++;
                log.info(j+"");
            }
        }else {
            for (int i=cruiserInfo.size()-1;i>0;i--) {
                CruiserDTO cruiserDTO = cruiserInfo.get(i);
                Double flyLat = cruiserDTO.getFlyLat();
                Double flyLon = cruiserDTO.getFlyLon();
                for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
                    String latitude = manageCoordinateDetail.getLatitude().toString();
                    String longitude = manageCoordinateDetail.getLongitude().toString();
                    if (latitude.equals(flyLat+"") && longitude.equals(flyLon+"")){
                        cruiserInfo.remove(i);
                        break;
                    }
                }
            }
            for (CruiserDTO cruiserDTO : cruiserInfo) {
                Double flyLat = cruiserDTO.getFlyLat();
                Double flyLon = cruiserDTO.getFlyLon();
                ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
                rsDTO.setLatitude(flyLat);
                rsDTO.setLongitude(flyLon);
                rsDTO.setState("2");
                rsDTO.setCreateTime(new Date());
                rsDTO.setUpdateTime(new Date());
                rsDTO.setCoordinateId(coordinateId);
                manageCoordinateDetailMapper.insert(rsDTO);
                j++;
                log.info(j+"");
            }
        }
        return 200;
    }

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

@@ -11,7 +11,10 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ManageCoordinate;
import com.moral.api.entity.ManageCoordinateDetail;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.ManageCoordinateMapper;
import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.service.ManageCoordinateService;


@@ -20,6 +23,9 @@

    @Autowired
    private ManageCoordinateMapper manageCoordinateMapper;

    @Autowired
    private ManageCoordinateDetailMapper manageCoordinateDetailMapper;

    /**
     * 新增路段
@@ -62,9 +68,16 @@
     * @param id
     */
    @Override
    public void deleteCoordinate(Integer id) {

    public Integer deleteCoordinate(Integer id) {
        QueryWrapper<ManageCoordinateDetail> wrapper = new QueryWrapper<>();
        wrapper.eq("coordinate_id",id);
        Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
        if (integer>0){
            return 1;
        }
        manageCoordinateMapper.deleteById(id);
        return 200;

    }

    /**