|
@@ -101,10 +101,13 @@ public class MileageController {
|
|
|
|
|
|
|
|
|
@GetMapping("pschange")
|
|
|
- public R<MileageVo> coordinate(String b , String value, String jj, String projId, String partId) {
|
|
|
- double[] aa= MileageUtill.azimuthZbXy(Double.parseDouble(value),Double.parseDouble(b),Double.parseDouble(jj),this.service.list(Wrappers.<Mileagexy>query().lambda().eq(Mileagexy::getPartId,partId).eq(Mileagexy::getProjectId,projId)));
|
|
|
+ public R<MileageVo> coordinate(String b , String value, String jj, String projectId, String partId) {
|
|
|
+ if(StringUtil.isEmpty(b)||StringUtil.isEmpty(value)||StringUtil.isEmpty(jj)||StringUtil.isEmpty(projectId)||StringUtil.isEmpty(partId)){
|
|
|
+ return R.fail("参数不全");
|
|
|
+ }
|
|
|
+ double[] aa= MileageUtill.azimuthZbXy(Double.parseDouble(value),Double.parseDouble(b),Double.parseDouble(jj),this.service.list(Wrappers.<Mileagexy>query().lambda().eq(Mileagexy::getPartId,partId).eq(Mileagexy::getProjectId,projectId)));
|
|
|
if(aa==null){
|
|
|
- return null;
|
|
|
+ return R.fail("线元信息不存在,请按照图纸录入系统");
|
|
|
}
|
|
|
MileageVo vo = new MileageVo();
|
|
|
vo.setX(Double.parseDouble(String.format("%.3f",aa[0])));
|