Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

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

@@ -143,9 +143,6 @@ public class MileageController {
     @PostMapping("/add")
     public R<Mileagexy> add (@RequestBody Mileagexy mileagexy){
         mileagexy.setUpdateUser(AuthUtil.getUserId());
-        mileagexy.setProjectId("");
-        mileagexy.setCreateTime(new Date());
-        mileagexy.setPartNo(mileagexy.getPartNo());
         mileagexy.setValueEnd(mileagexy.getValue()+mileagexy.getL());
         //必须要设置angle
         mileagexy.setAngle(mileagexy.getDu()+Double.valueOf(mileagexy.getFen())/60+mileagexy.getMiao()/3600);
@@ -175,15 +172,14 @@ public class MileageController {
 
 
     @PostMapping("/update")
-    public R<Boolean> upDate (@RequestBody Mileagexy mileagexy){
-        Mileagexy old = service.getById(mileagexy.getId());
-        old.setPartNo(mileagexy.getPartNo());
-        old.setCreateTime(mileagexy.getCreateTime());
-        old.setPartId(mileagexy.getProjectId());
-        old.setValueEnd(mileagexy.getValue()+mileagexy.getL());
+    public R upDate (@RequestBody Mileagexy mileagexy){
+        if(mileagexy.getId()==null){
+            return R.fail("对象不存在");
+        }
+        mileagexy.setValueEnd(mileagexy.getValue()+mileagexy.getL());
         //必须要设置angle
-        old.setAngle(mileagexy.getDu()+ Double.valueOf(mileagexy.getFen())/60+mileagexy.getMiao()/3600);
-        return R.status(this.service.updateById(old));
+        mileagexy.setAngle(mileagexy.getDu()+ Double.valueOf(mileagexy.getFen())/60+mileagexy.getMiao()/3600);
+        return R.status(this.service.updateById(mileagexy));
     }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/utils/FunctionMain.java

@@ -171,11 +171,11 @@ public class FunctionMain {
           System.out.println(sql);
     }
 
-    /*public static void main(String[] args)  {
+    public static void main(String[] args)  {
 //        createTable(Formula.class,"公式配置");
 //        System.out.println(builder(Formula.class));
           getToken();
-    }*/
+    }
 
 
 }