From b3d9dd3b5d0b4211375abbd34371ad573a3ad929 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 21 Jun 2024 15:17:12 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisCommonController.java | 10 +++++----- .../web/emis/EmisCommonToolsController.java | 5 +++-- .../erp/web/emis/EmisGoodsController.java | 2 +- .../erp/web/emis/EmisStaffController.java | 8 ++++---- .../web/emis/EmisTmsScanRecordController.java | 2 +- .../erp/web/emis/EmisWaybillController.java | 20 +++++++++---------- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index afa043f1b..e4244f731 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -317,7 +317,7 @@ public class EmisCommonController extends EmisBaseController - @RequestMapping("/getPrintDataByPrinter") + @GetMapping("/getPrintDataByPrinter") public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode) { @@ -378,7 +378,7 @@ public class EmisCommonController extends EmisBaseController /** * 获取打印模版 */ - @RequestMapping(value = "/getTnPrinterLocalPrintTpl") + @GetMapping(value = "/getTnPrinterLocalPrintTpl") public AjaxResult getTnPrinterLocalPrintTpl(String key,String siteCode,String appCode) { try { @@ -423,7 +423,7 @@ public class EmisCommonController extends EmisBaseController * @param sign * @return */ - @RequestMapping("/queryTraceInfo") + @GetMapping("/queryTraceInfo") public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String sign) { if(StringUtils.isAnyEmpty(mainNo,appId,sign)){ @@ -450,7 +450,7 @@ public class EmisCommonController extends EmisBaseController * 短信发送触发 * @return */ - @RequestMapping("/autoDoSendSmsTrigger") + @GetMapping("/autoDoSendSmsTrigger") public AjaxResult autoDoSendSmsTrigger(){ String lockKey="autoDoSendSmsTrigger"; log.error("autoDoSendSmsTrigger start"); @@ -475,7 +475,7 @@ public class EmisCommonController extends EmisBaseController * 物流轨迹采集触发 * @return */ - @RequestMapping("/autoDoQueryTransferInfoTrigger") + @GetMapping("/autoDoQueryTransferInfoTrigger") public AjaxResult autoDoQueryTransferInfoTrigger(){ String lockKey="autoDoQueryTransferInfoTrigger"; log.error("autoDoQueryTransferInfoTrigger start"); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java index 2cf28c85b..e38aa104c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java @@ -26,6 +26,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillService; import com.xdadan.erp.system.domain.SysNotice; import com.xdadan.erp.system.service.ISysNoticeService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -59,7 +60,7 @@ public class EmisCommonToolsController extends EmisBaseController /** * 获取app首页统计 */ - @RequestMapping(value = "/getAppHomeStatData") + @GetMapping(value = "/getAppHomeStatData") public AjaxResult getAppHomeStatData() { try { @@ -105,7 +106,7 @@ public class EmisCommonToolsController extends EmisBaseController } - @RequestMapping(value = "/getLatestNotices") + @GetMapping(value = "/getLatestNotices") @JacksonFilter(include= {"noticeId","noticeTitle","noticeType","noticeContent","createTime"},value= SysNotice.class,type= JacksonFilter.JscksonFilterType.RESPONSE) public TableDataInfo getLatestNotices(SysNotice notice) { diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java index 494da5285..a509beee3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java @@ -122,7 +122,7 @@ public class EmisGoodsController extends EmisBaseController "licNo", "orderNum" },value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @RequestMapping("/listHotGoods") + @GetMapping("/listHotGoods") public TableDataInfo listHotGoods(String customerCode) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java index e6988f56c..a08371416 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java @@ -63,7 +63,7 @@ public class EmisStaffController extends EmisBaseController */ // @PreAuthorize("@ss.hasPermi('system:user:list')") @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @RequestMapping("/getStaffList") + @GetMapping("/getStaffList") public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue) { SysUser queryUser = new SysUser(); @@ -103,7 +103,7 @@ public class EmisStaffController extends EmisBaseController * @return */ @JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @RequestMapping("/getPayeeList") + @GetMapping("/getPayeeList") public TableDataInfo getPayeeList(String searchValue) { SysUser queryUser = new SysUser(); @@ -119,7 +119,7 @@ public class EmisStaffController extends EmisBaseController * @return */ @JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @RequestMapping("/getSalemanList") + @GetMapping("/getSalemanList") public TableDataInfo getSalesmenList(String searchValue) { SysUser queryUser = new SysUser(); @@ -129,7 +129,7 @@ public class EmisStaffController extends EmisBaseController return getDataTable(list); } - @RequestMapping("/getStaffQRCodePng") + @GetMapping("/getStaffQRCodePng") public void getStaffQRCodePng(HttpServletResponse response,Integer size) { diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index 578ec0647..b24a632d7 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -205,7 +205,7 @@ public class EmisTmsScanRecordController extends EmisBaseController * @param trackingNo * @return */ - @RequestMapping("/queryWaybillTraceInfo") + @GetMapping("/queryWaybillTraceInfo") public AjaxResult queryWaybillTraceInfo(String trackingNo,String lang) { if(StringUtils.isEmpty(trackingNo)){ diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index d79927f0a..78925a4b4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -92,7 +92,7 @@ public class EmisWaybillController extends EmisBaseController private IEmisTmsScanRecordService emisTmsScanRecordService; - @RequestMapping(value = "/checkWaybillIsExists") + @GetMapping(value = "/checkWaybillIsExists") public AjaxResult checkWaybillIsExists(String billCode){ return AjaxResult.success("操作成功", emisBaseService.checkWaybillIsExists(billCode)); } @@ -100,7 +100,7 @@ public class EmisWaybillController extends EmisBaseController /** * 获取电子运单信息 */ - @RequestMapping(value = "/getWaybillDetail") + @GetMapping(value = "/getWaybillDetail") public AjaxResult getWaybillDetail(String billCode ,String orderSn) { try { @@ -445,7 +445,7 @@ public class EmisWaybillController extends EmisBaseController * @param emisWaybill * @return */ - @RequestMapping("/getWaybillStatMap") + @GetMapping("/getWaybillStatMap") public AjaxResult getWaybillStatMap(EmisWaybill emisWaybill) { // 设置通用权限查询参数 @@ -457,7 +457,7 @@ public class EmisWaybillController extends EmisBaseController } - @RequestMapping("/selectEmisWaybillByMutiBillCode") + @GetMapping("/selectEmisWaybillByMutiBillCode") public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill) { startPage(); @@ -526,7 +526,7 @@ public class EmisWaybillController extends EmisBaseController // @JacksonFilter(include= { // "billCode","scanDate" // },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @RequestMapping("/queryScanWaybillList") + @GetMapping("/queryScanWaybillList") public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord,String scanStatType, String beginScanDate, String endScanDate, String billCode ) { @@ -558,7 +558,7 @@ public class EmisWaybillController extends EmisBaseController return getDataTable(list); } - @RequestMapping("/realGetWaybillPrintData") + @GetMapping("/realGetWaybillPrintData") public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) { /* @@ -625,7 +625,7 @@ public class EmisWaybillController extends EmisBaseController return AjaxResult.error("获取失败"); } - @RequestMapping("/realGetPrintList") + @GetMapping("/realGetPrintList") public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType) { /* @@ -763,7 +763,7 @@ public class EmisWaybillController extends EmisBaseController } - @RequestMapping("/realGetWaybillPdf") + @GetMapping("/realGetWaybillPdf") public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode,String isNeedPdf) { if(StringUtils.isEmpty(billCode)){ @@ -792,7 +792,7 @@ public class EmisWaybillController extends EmisBaseController } - @RequestMapping("/realGetWaybillPng") + @GetMapping("/realGetWaybillPng") public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) { @@ -850,7 +850,7 @@ public class EmisWaybillController extends EmisBaseController } - @RequestMapping("/getPrintDataByPrinter") + @GetMapping("/getPrintDataByPrinter") public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode) {