Merge remote-tracking branch 'origin/master'

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/MileagexyDTO.java

@@ -0,0 +1,47 @@
+package org.springblade.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2022/6/13 11:29
+ * @description TODO
+ */
+@Data
+public class MileagexyDTO {
+    private Long id;
+    private Double value=0.0;		// 里程
+    private Double x=0.0;		// x
+    private Double y=0.0;
+    private Double r=0.0;         //半径
+    private Integer orderNum=0;     //顺序
+    private Integer type=0;     //类型 0 起点  1交点  2终点
+    private Double angle=0.0;     //方位角
+    private Double corner=0.0;     //转角
+    private String swing="右转";     //转向
+    private Double ls1=0.0;         //第一缓和线
+    private Double ls2=0.0;         //第二缓和线
+    private Double l=0.0;           //曲线长
+    private Double lc=0.0;          //圆曲线长
+    private Double t1=0.0;          //切线长1
+    private Double t2=0.0;          //切线长2
+    private Double d=0.0;          //切线差
+    private Double p1=0.0;          //
+    private Double q1=0.0;          //
+    private Double p2=0.0;          //
+    private Double q2=0.0;          //
+    private Double b01=0.0;
+    private Double b02=0.0;
+    private Double ljd=0.0;       //上个点到该点的长
+    private Double zh=0.0;    //直缓点
+    private Double zhx=0.0;		// x
+    private Double zhy=0.0;
+    private Double hy=0.0;    //缓圆点
+    private Double yh=0.0;//圆缓点
+    private Double hz=0.0;//缓直点
+    private Double hzx=0.0;		// x
+    private Double hzy=0.0;
+    private Double qz=0.0;//曲中点
+    private Double dlq=0.0;//   断链前里程
+    private Double dlh=0.0;//断链后里程
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/Mileage.java

@@ -14,8 +14,7 @@ public class Mileage implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private String projId;		// projId
-	private String orgId;		// orgId
+	private String projectId;		// projId
 	private String notes;		// notes
 	private String code;		// 名称
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/MileageController.java

@@ -9,6 +9,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springblade.business.dto.MileagePartDto;
+import org.springblade.business.dto.MileagexyDTO;
 import org.springblade.business.entity.Mileage;
 import org.springblade.business.entity.MileagePart;
 import org.springblade.business.entity.Mileagexy;
@@ -23,6 +24,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
@@ -119,10 +121,10 @@ public class MileageController {
     }
 
     @PostMapping("/import")
-    public R importXy(@RequestParam("file") MultipartFile file, String projectId,String partId ) throws Exception {
+    public R importXy(@RequestParam("file") MultipartFile file, String projectId,String partId,String contractId ) throws Exception {
         if(file != null&&Func.isNotEmpty(partId)) {
             if(Pattern.matches(".+(\\.xls)x?$", Objects.requireNonNull(file.getOriginalFilename()).toLowerCase(Locale.ROOT))) {
-             return   R.success(this.service.importMileagexy(file,AuthUtil.getUserId(),projectId,partId));
+             return   R.success(this.service.importMileagexy(file,AuthUtil.getUserId(),projectId,contractId,partId));
             } else {
                return   R.fail("文件格式不正确，请上传Excel文件");
             }
@@ -172,14 +174,18 @@ public class MileageController {
 
 
     @PostMapping("/update")
-    public R upDate (@RequestBody Mileagexy mileagexy){
-        if(mileagexy.getId()==null){
-            return R.fail("对象不存在");
+    public R upDate (@RequestBody MileagexyDTO mileagexy){
+        if(mileagexy.getId()!=null){
+            Mileagexy m= this.service.getById(mileagexy.getId());
+            if(m!=null){
+                BeanUtils.copyProperties(mileagexy,m);
+                m.setValueEnd(mileagexy.getValue()+mileagexy.getL());
+                //必须要设置angle
+                mileagexy.setAngle(m.getDu()+ Double.valueOf(m.getFen())/60+m.getMiao()/3600);
+                return R.status(this.service.updateById(m));
+            }
         }
-        mileagexy.setValueEnd(mileagexy.getValue()+mileagexy.getL());
-        //必须要设置angle
-        mileagexy.setAngle(mileagexy.getDu()+ Double.valueOf(mileagexy.getFen())/60+mileagexy.getMiao()/3600);
-        return R.status(this.service.updateById(mileagexy));
+        return R.fail("对象不存在");
     }
 
 
@@ -198,7 +204,7 @@ public class MileageController {
 
     @GetMapping("getZzList")
     public R<List<Mileage>> getZzList(Mileage mileage) {
-        List<Mileage> mileages = new ArrayList<>(MileageUtill.azimuthZzZbXy(mileage.getX(), mileage.getY(), mileage.getValue(), mileage.getB(), this.service.list(Wrappers.<Mileagexy>query().lambda().eq(Mileagexy::getPartId,mileage.getPartId()).eq(Mileagexy::getProjectId,mileage.getProjId()).orderByAsc(Mileagexy::getOrderNum))));
+        List<Mileage> mileages = new ArrayList<>(MileageUtill.azimuthZzZbXy(mileage.getX(), mileage.getY(), mileage.getValue(), mileage.getB(), this.service.list(Wrappers.<Mileagexy>query().lambda().eq(Mileagexy::getPartId,mileage.getPartId()).eq(Mileagexy::getProjectId,mileage.getProjectId()).orderByAsc(Mileagexy::getOrderNum))));
          if(CollectionUtil.isNotEmpty(mileages)){
             return R.data(mileages);
          }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MileagexyService.java

@@ -100,7 +100,7 @@ public class MileagexyService  extends BaseServiceImpl<MileagexyMapper, Mileagex
     }
 
 
-    public String importMileagexy(MultipartFile file,Long userId,String projectId, String partId) throws Exception {
+    public String importMileagexy(MultipartFile file,Long userId,String projectId, String contractId ,String partId) throws Exception {
         try {
             Workbook wb = WorkbookFactory.create(file.getInputStream());
             Sheet sheet = wb.getSheetAt(0);
@@ -144,6 +144,7 @@ public class MileagexyService  extends BaseServiceImpl<MileagexyMapper, Mileagex
                 obj.setProjectId(projectId);
                 obj.setValueEnd(obj.getValue()+obj.getL());
                 obj.setPartId(partId);
+                obj.setContractId(contractId);
                 obj.setPartNo(part.getPrefix());
                 //必须要设置angle
                 obj.setAngle(obj.getDu()+Double.valueOf(obj.getFen())/60+obj.getMiao()/3600);