修改了“维修记录”和 “汽车衡一次计量数据”和 “轨道衡一次计量数据”和 “汽车衡预报”和“重量类型”接口

src/main/java/com/steerinfo/associate/maintenancerecord/controller/MaintenanceRecordController.java

@@ -124,4 +124,20 @@ public class MaintenanceRecordController extends BaseRESTfulController {
     	}
       return success();
     }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("maintenancerecord:delete")
+    @DeleteMapping(value = "/deleteBacth")//String
+    public RESTfulResult deleteBacth(@RequestBody List<MaintenanceRecord> model){
+        List<String> list = new ArrayList<>();
+        for(MaintenanceRecord models: model){
+            list.add(models.getMaintenanceRecordNo());
+        }
+        if(ListUtils.isNotEmpty(list)) {
+            List<String> ids = ListUtils.convertList(list);
+            maintenanceRecordService.delete(ids);
+        }
+        return success();
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2425,7 +2425,7 @@
     <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         SELECT
         <include refid="columns"/>
-        from meter_work_car_act_fir_view
+        from METER_WORK_CAR_ACTUAL_FIRST
         <where>
             <if test="carNo != null and carNo != ''">
                 and CAR_NO LIKE '%${carNo}%'

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/controller/MeterWorkPreWgttypeController.java

@@ -8,6 +8,9 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcarrecover.model.MeterWorkCarRecover;
 import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
 import com.steerinfo.meterwork.meterworkprewgttype.service.IMeterWorkPreWgttypeService;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
+import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
+import com.steerinfo.pretrack.pretrackscale.service.impl.PreTrackScaleServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -15,6 +18,8 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -44,6 +49,9 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
     @Autowired
     IMeterWorkPreWgttypeService meterWorkPreWgttypeService;
 
+    @Autowired
+    IPreTrackScaleService preTrackScaleService;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -71,19 +79,39 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
     @ApiOperation(value="创建", notes="根据MeterWorkPreWgttype对象创建")
     @ApiImplicitParam(name = "meterWorkPreWgttype", value = "详细实体meterWorkPreWgttype", required = true, dataType = "MeterWorkPreWgttype")
     //@RequiresPermissions("meterworkprewgttype:create")
+    @Transactional
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkPreWgttype model){
+    public RESTfulResult add(@RequestBody MeterWorkPreWgttype model,String preTrackScaleNo){
         try {
             HashMap map = meterWorkPreWgttypeService.addOrAbolish(model);
-
-            if (map.get("code").equals("0")){
-                return success();
-            }
-            else {
-                return failed(map.get("msg"));
+            if (preTrackScaleNo == "" || preTrackScaleNo.equals("")){
+                if (map.get("code").equals("0")){
+                    return success();
+                }
+                else {
+                    return failed(map.get("msg"));
+                }
+            }else{
+                PreTrackScale preTrackScale = new PreTrackScale();
+                preTrackScale.setPredictionNo(preTrackScaleNo);
+                preTrackScale.setCarNo(model.getCarNo());
+                int scale = preTrackScaleService.setPreIndex(preTrackScale);
+                if (map.get("code").equals("0") && scale > 0){
+                    return success();
+                }
+                else if(scale == -1){
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return failed("已经存在已使用的委托，不可修改");
+                }
+                else {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return failed(map.get("msg"));
+                }
             }
+
         } catch (Exception ex) {
             ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new MarkerMetException(500, "操作异常！！");
         }
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -2474,7 +2474,7 @@
   </select>
 
   <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from meter_work_rail_act_fir_view
+    SELECT <include refid="columns"/> from METER_WORK_RAILWAY_ACT_FIRST
     <where>
       <if test="railwayNo != null and railwayNo != ''">
         and RAILWAY_NO LIKE '%${railwayNo}%'
@@ -2715,7 +2715,7 @@
 
   <!--动轨一次计量数据查询-->
   <select id="selectAct" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from meter_work_rail_act_fir_view
+    SELECT <include refid="columns"/> from METER_WORK_RAILWAY_ACT_FIRST
     <where>
       <if test="railwayNo != null and railwayNo != ''">
         and RAILWAY_NO LIKE '%${railwayNo}%'
@@ -2913,7 +2913,7 @@
 
   <!--静轨一次计量数据维护界面数据查询-->
   <select id="selectSta" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from meter_work_rail_act_fir_view
+    SELECT <include refid="columns"/> from METER_WORK_RAILWAY_ACT_FIRST
     <where>
       <if test="railwayNo != null and railwayNo != ''">
         and RAILWAY_NO LIKE '%${railwayNo}%'

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/controller/MeterWorkRailwayRecMainController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.service.IMeterWorkRailwayRecMainService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,7 @@ import java.math.BigDecimal;
  */
 @RestController
 @RequestMapping("/${api.version}/meterworkrailwayrecmains")
+@Api(value = "/${api.version}/meterworkrailwayrecmains", tags = "车次号查询 - MeterWorkRailwayRecMainController")
 public class MeterWorkRailwayRecMainController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -91,7 +91,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
     })
     //@RequiresPermissions("pretrackscale:view")
     @PostMapping(value = "/like/")
-    public RESTfulResult listLikePost(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
         try {
             PageList<PreTrackScale> list = preTrackScaleService.queryLikeForPage(parmas, pageNum, pageSize);
             return success(list);