1.整理swaggerAPI格式

2.取消一次计量历史数据查询接口

src/main/java/com/steerinfo/baseinfo/meterbasecalibrationnum/controller/MeterBaseCalibrationNumController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasecalibrationnum.model.MeterBaseCalibration
 import com.steerinfo.baseinfo.meterbasecalibrationnum.service.IMeterBaseCalibrationNumService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +38,7 @@ import java.util.ArrayList;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecalibrationnums")
+@Api(value = "/${api.version}/meterbasecalibrationnums", tags = "校秤计量配置 - MeterBaseCalibrationNumController")
 public class MeterBaseCalibrationNumController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasecalibrationtime/controller/MeterBaseCalibrationTimeController.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasecalibrationtime.model.MeterBaseCalibrationTime;
 import com.steerinfo.baseinfo.meterbasecalibrationtime.service.IMeterBaseCalibrationTimeService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+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.util.ArrayList;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecalibrationtimes")
+@Api(value = "/${api.version}/meterbasecalibrationtimes", tags = "校秤时间配置 - MeterBaseCalibrationTimeController")
 public class MeterBaseCalibrationTimeController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasecarrierunit/controller/MeterBaseCarrierUnitController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasecarrierunit.model.MeterBaseCarrierUnit;
 import com.steerinfo.baseinfo.meterbasecarrierunit.service.IMeterBaseCarrierUnitService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecarrierunits")
+@Api(value = "/${api.version}/meterbasecarrierunits", tags = "承运单位维护 - MeterBaseCarrierUnitController")
 public class MeterBaseCarrierUnitController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasecarrierunitcar/controller/MeterBaseCarrierUnitCarController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasecarrierunitcar.model.MeterBaseCarrierUnit
 import com.steerinfo.baseinfo.meterbasecarrierunitcar.service.IMeterBaseCarrierUnitCarService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.ArrayList;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecarrierunitcars")
+@Api(value = "/${api.version}/meterbasecarrierunitcars", tags = "承运单位车辆维护 - MeterBaseCarrierUnitCarController")
 public class MeterBaseCarrierUnitCarController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasecussupcar/controller/MeterBaseCusSupCarController.java

@@ -11,6 +11,7 @@ import com.steerinfo.baseinfo.meterbasecussupcar.service.IMeterBaseCusSupCarServ
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -41,6 +42,7 @@ import java.util.ArrayList;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecussupcars")
+@Api(value = "/${api.version}/meterbasecussupcars", tags = "客商车辆维护 - MeterBaseCusSupCarController")
 public class MeterBaseCusSupCarController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/controller/MeterBaseCustomerSupplierController.java

@@ -9,6 +9,7 @@ import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerS
 import com.steerinfo.baseinfo.meterbasecustomersupplier.service.IMeterBaseCustomerSupplierService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +38,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecustomersuppliers")
+@Api(value = "/${api.version}/meterbasecustomersuppliers", tags = "客商维护 - MeterBaseCustomerSupplierController")
 public class MeterBaseCustomerSupplierController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasedoublediff/controller/MeterBaseDoubleDiffController.java

@@ -7,6 +7,7 @@ import com.steerinfo.baseinfo.meterbasedoublediff.model.MeterBaseDoubleDiff;
 import com.steerinfo.baseinfo.meterbasedoublediff.service.IMeterBaseDoubleDiffService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +34,7 @@ import java.util.HashMap;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasedoublediffs")
+@Api(value = "/${api.version}/meterbasedoublediffs", tags = "双秤差值配置 - MeterBaseDoubleDiffController")
 public class MeterBaseDoubleDiffController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasehistarecount/controller/MeterBaseHisTareCountController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasehistarecount.model.MeterBaseHisTareCount;
 import com.steerinfo.baseinfo.meterbasehistarecount.service.IMeterBaseHisTareCountService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasehistarecounts")
+@Api(value = "/${api.version}/meterbasehistarecounts", tags = "历史皮重计算配置 - MeterBaseHisTareCountController")
 public class MeterBaseHisTareCountController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasehistarecountd/controller/MeterBaseHisTareCountDController.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasehistarecountd.model.MeterBaseHisTareCountD;
 import com.steerinfo.baseinfo.meterbasehistarecountd.service.IMeterBaseHisTareCountDService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +34,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasehistarecountds")
+@Api(value = "/${api.version}/meterbasehistarecountds", tags = "历史皮重计算配置_从表 - MeterBaseHisTareCountDController")
 public class MeterBaseHisTareCountDController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasehistaredata/controller/MeterBaseHisTareDataController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasehistaredata.model.MeterBaseHisTareData;
 import com.steerinfo.baseinfo.meterbasehistaredata.service.IMeterBaseHisTareDataService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasehistaredatas")
+@Api(value = "/${api.version}/meterbasehistaredatas", tags = "历史皮重数据 - MeterBaseHisTareDataController")
 public class MeterBaseHisTareDataController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/controller/MeterBaseHisTareDetailController.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail;
 import com.steerinfo.baseinfo.meterbasehistaredetail.service.IMeterBaseHisTareDetailService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +34,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasehistaredetails")
+@Api(value = "/${api.version}/meterbasehistaredetails", tags = "历史皮重数据皮重明细 - MeterBaseHisTareDetailController")
 public class MeterBaseHisTareDetailController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasemutualdiff/controller/MeterBaseMutualDiffController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasemutualdiff.model.MeterBaseMutualDiff;
 import com.steerinfo.baseinfo.meterbasemutualdiff.service.IMeterBaseMutualDiffService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasemutualdiffs")
+@Api(value = "/${api.version}/meterbasemutualdiffs", tags = "互检差值配置 - MeterBaseMutualDiffController")
 public class MeterBaseMutualDiffController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasetermtarecount/controller/MeterBaseTermTareCountController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasetermtarecount.model.MeterBaseTermTareCoun
 import com.steerinfo.baseinfo.meterbasetermtarecount.service.IMeterBaseTermTareCountService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasetermtarecounts")
+@Api(value = "/${api.version}/meterbasetermtarecounts", tags = "期限皮重数据 - MeterBaseTermTareCountController")
 public class MeterBaseTermTareCountController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/controller/MeterBaseTermTareDataController.java

@@ -11,6 +11,7 @@ import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.dto.CommonCombination;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -39,6 +40,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasetermtaredatas")
+@Api(value = "/${api.version}/meterbasetermtaredatas", tags = "期限皮重数据 - MeterBaseTermTareDataController")
 public class MeterBaseTermTareDataController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbasetermtaretime/controller/MeterBaseTermTareTimeController.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasetermtaretime.model.MeterBaseTermTareTime;
 import com.steerinfo.baseinfo.meterbasetermtaretime.service.IMeterBaseTermTareTimeService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasetermtaretimes")
+@Api(value = "/${api.version}/meterbasetermtaretimes", tags = "期限皮重时间 - MeterBaseTermTareTimeController")
 public class MeterBaseTermTareTimeController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -12,6 +12,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterworkcaractualfirsts")
+@Api(value = "/${api.version}/meterworkcaractualfirsts", tags = "计量汽车衡一次数据 - MeterWorkCarActualFirstController")
 public class MeterWorkCarActualFirstController extends BaseRESTfulController {
 
     @Autowired
@@ -239,6 +241,9 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         return rm;
     }
 
+    /*
+    By BourneCao 20211222 和杨秀东确认，不再需要一次计量历史查询表和相关视图
+
     @ApiOperation(value = "历史查询", notes = "根据传入参数进行查询")
     @GetMapping(value = "/selectView")
     public RESTfulResult selectView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
@@ -257,6 +262,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
         return rm;
     }
+     */
 
     @ApiOperation(value = "停用", notes = "根据MeterWorkCarActualFirst对象创建")
     @PostMapping(value = "/abolish")

src/main/java/com/steerinfo/pretrack/pretracknotice/controller/PreTrackNoticeController.java

@@ -8,6 +8,7 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
 import com.steerinfo.pretrack.pretracknotice.service.IPreTrackNoticeService;
 import com.steerinfo.util.CommonPage;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/pretracknotices")
+@Api(value = "/${api.version}/pretracknotices", tags = "汽车衡通知单信息 - PreTrackNoticeController")
 public class PreTrackNoticeController extends BaseRESTfulController {
 
     @Autowired

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

@@ -8,6 +8,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/pretrackscales")
+@Api(value = "/${api.version}/pretrackscales", tags = "汽车衡计量预报 - PreTrackScaleController")
 public class PreTrackScaleController extends BaseRESTfulController {
 
     @Autowired