发单报found2;

This commit is contained in:
高正杨
2026-01-30 10:25:08 +08:00
parent 5786521755
commit d914f48ef0
2 changed files with 278 additions and 279 deletions
@@ -1,277 +1,277 @@
package com.mhd.oms.infrastructure.feign;
import com.mhd.common.core.constant.ServiceNameConstants;
import com.mhd.common.core.domain.dto.BasicAgreementDTO;
import com.mhd.common.core.domain.dto.SysMultistageDictDto;
import com.mhd.common.core.domain.dto.SysProvinceCityCountyDTO;
import com.mhd.common.core.domain.dto.open.SystemOpenApiLogDTO;
import com.mhd.common.core.domain.dto.open.ThirdPartyServiceReqLogDTO;
import com.mhd.common.core.domain.entity.R;
import com.mhd.common.core.domain.po.SysMultistageDictPo;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.oms.infrastructure.feign.dto.AbnormalAddressBookDTO;
import com.mhd.oms.infrastructure.feign.dto.NoticeMessageLoggingDto;
import com.mhd.oms.infrastructure.feign.dto.QueryExpenseAccountDTO;
import com.mhd.oms.infrastructure.feign.po.NoticeMessageLoggingPo;
import com.mhd.system.api.domain.SysDictData;
import com.mhd.system.api.feign.FeignAutoConfiguration;
import com.mhd.system.api.model.LoginUser;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Description
* @Author zg
* @Version 1.0
* @Date 2023/11/1 13:40
*/
@FeignClient(contextId = "SystemServiceFeign", value = ServiceNameConstants.SYSTEM_SERVICE, configuration = FeignAutoConfiguration.class)
public interface SystemServiceFeign {
/**
* 多级分类字典,根据code查询字典信息
* 此接口查询多级分类字典,如果是一级字典,则只需传入字典code,如果是二级或三级字典,则还需要传入父类code,否则会查询失败
*
* @param multistageDictCode 本级code
* @param parentDictCode 父级code
* @return
*/
@GetMapping("/basicApi/getMultistageDictInfoByCode")
public AjaxResult getMultistageDictInfoByCode(@RequestParam("multistageDictCode") String multistageDictCode, @RequestParam("parentDictCode") String parentDictCode);
/**
* 查询多级分类字典
*
* @param sysMultistageDictDto
* @return
*/
@GetMapping("/basicApi/selectMultistageDictList")
public AjaxResult selectMultistageDictList(SysMultistageDictDto sysMultistageDictDto);
/**
* 根据字典类型查询字典数据信息
*
* @param dictType
* @return
*/
@GetMapping("/dict/data/type/{dictType}")
public AjaxResult selectListByDictType(@PathVariable("dictType") String dictType);
/**
* 根据县级编码,查询省市县信息
*
* @param sysProvinceDTO
* @return
*/
@PostMapping("/basicApi/findAreaInfo")
public AjaxResult selectFindAreaInfoList(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
/**
* 根据市区编码查询市区信息
*
* @param sysProvinceDTO
* @return
*/
@PostMapping("/basicApi/findAreaInfoByCityCode")
public AjaxResult findAreaInfoByCityCode(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
/**
* 根据省份编码查询省份信息
*
* @param sysProvinceDTO
* @return
*/
@PostMapping("/basicApi/findAreaInfoByProvince")
public AjaxResult findAreaInfoByProvince(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
//=================================
/**
* 查询字典数据详细
*
* @param dictCode
* @return
*/
@GetMapping("/dict/data/{dictCode}")
public AjaxResult getTopOrganization(@PathVariable("dictCode") Long dictCode);
/**
* 根据条件查询字典数据列表
* @param sysDictData
* @return
*/
@PostMapping("/dict/data/findDatalist")
public AjaxResult findDatalist(@RequestBody SysDictData sysDictData);
/**
* 根据条件查询分类字典数据列表
* @param
* @return
*/
@PostMapping("/basicApi/getMultistageDictList")
public R<List<SysMultistageDictPo>> getMultistageDictList(@RequestBody SysMultistageDictDto sysMultistageDictDto);
/**
* 根据条件查询分类字典数据列表
* @param
* @return
*/
@PostMapping("/basicApi/getMultistageDictTreeList")
public R<List<SysMultistageDictPo>> getMultistageDictTreeList(@RequestBody SysMultistageDictDto sysMultistageDictDto);
/**
* 根据条件查询分类字典数据列表
* @param
* @return
*/
@PostMapping("/dict/data/getDictDataList")
public R<List<SysDictData>> getDictDataList(@RequestBody SysDictData sysDictData);
/**
* 查询省市县三级
*
* @param sysProvinceDTO
* @return
*/
@PostMapping("/basicApi/selectAreaChildrenList")
public TableDataInfo selectAreaChildrenList(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
/**
* 根据code查询分类字典信息
*
* @param multistageDictCode
* @return
*/
@GetMapping(value = "/basicApi/getMultistageDictInfoByCode/{multistageDictCode}")
public AjaxResult getMultistageDictInfoByCode(@PathVariable(value = "multistageDictCode", required = true) String multistageDictCode);
/**
* 根据code查询多级分类字典集合
*
* @param code
* @return
*/
@GetMapping(value = "/basicApi/getSysMultistageDictList/{code}")
public AjaxResult getSysMultistageDictList(@PathVariable(value = "code") String code);
/**
* 根据topCode查询多级分类字典集合(同一父级字典下所有)
*
* @param topCode
* @return
*/
@GetMapping(value = "/basicApi/getTopMultistageDictList/{topCode}")
public AjaxResult getTopMultistageDictList(@PathVariable(value = "topCode") String topCode);
/**
* 新增消息通知 单条
*
* @param noticeMessageLoggingDto
* @return
*/
@PostMapping("/messageManageApi/addMessageLogging")
public AjaxResult addMessageLogging(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
/**
* 消息记录列表查询-feign
*
* @return
*/
@ApiOperation("消息记录列表查询-feign")
@PostMapping("/messageManageApi/noticeMessageLoggingListByFeign")
public List<NoticeMessageLoggingPo> noticeMessageLoggingListByFeign(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
/**
* 新增消息通知 批量
*
* @param noticeMessageLoggingDto
* @return
*/
@PostMapping("/messageManageApi/addMessageLoggingList")
public AjaxResult addMessageLoggingList(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
/**
* 根据协议code和租户查询系统协议
*/
@GetMapping("/basicApi/findAgreementByCodeAndOrg")
public AjaxResult findAgreementByCodeAndOrg(BasicAgreementDTO basicAgreementDTO);
/**
* 获取指定组织的开关按钮配置-feign
*/
@ApiOperation("获取指定组织的开关按钮配置")
@GetMapping("/userConfigSwitchApi/getUserConfigSwitchInfoByOrgId")
public AjaxResult getUserConfigSwitchInfoByOrgId(@RequestParam("organizationId") Long organizationId);
/**
* 获取当前租户开关按钮配置-feign
*/
@ApiOperation("获取当前租户开关配置信息")
@PostMapping("/userConfigSwitchApi/getUserConfigSwitchInfoByFeign")
public AjaxResult getUserConfigSwitchInfoByFeign(@RequestBody LoginUser loginUser);
@ApiOperation("根据code、一级组织ID查询多级分类字典集合")
@GetMapping(value = "/basicApi/getSysMultistageDictByCodeAndTopOrgId")
public AjaxResult getSysMultistageDictByCodeAndTopOrgId(@RequestParam("code") String code, @RequestParam("topOrgId") Long topOrgId);
@ApiOperation("根据topCode、一级组织ID查询多级分类字典集合(同一父级字典下所有)")
@GetMapping(value = "/basicApi/getMultistageDictListByTopCodeAndTopOrgId")
public AjaxResult getMultistageDictListByTopCodeAndTopOrgId(@RequestParam("topCode") String topCode, @RequestParam("topOrgId") Long topOrgId);
@ApiOperation("新增多级分类字典-开放接口")
@PostMapping("/basicApi/addMultistageDictByOpen")
public AjaxResult addMultistageDictByOpen(@RequestBody SysMultistageDictDto sysMultistageDictDto);
/**
* @description 保存请求服务日志
* @author ZhouGY
* @date 2024/1/26 17:03
* @param systemOpenApiLogDTO
*/
@PostMapping(value = "/systemOpenApiLogApi/save")
public AjaxResult saveLog(@RequestBody SystemOpenApiLogDTO systemOpenApiLogDTO);
/**
* @description 保存三方服务日志
* @author ZhouGY
* @date 2024/1/26 17:03
* @param thirdPartyServiceReqLogDTO
*/
@PostMapping(value = "/thirdPartyServiceReqLogApi/save")
public AjaxResult saveThirdPartyServiceReqLog(@RequestBody ThirdPartyServiceReqLogDTO thirdPartyServiceReqLogDTO);
/**
* 获取用户所在租户的开关配置信息
* @return
*/
@GetMapping("/userConfigSwitchApi/getUserConfigSwitchInfo")
public AjaxResult getUserConfigSwitchInfo();
/**
* 编辑异常匹配地址簿
* @return
*/
@PostMapping("/abnormalAddressBookApi/saveBatchAddressBook")
public AjaxResult saveBatchAddressBook(@RequestBody List<AbnormalAddressBookDTO> abnormalAddressBookDTOList);
/**
* 匹配地址簿
* @return
*/
@PostMapping("/abnormalAddressBookApi/matchAddressBook")
public AjaxResult matchAddressBook(@RequestBody AbnormalAddressBookDTO abnormalAddressBookDTO);
/**
* 查询社会车辆-费用科目
* @return
*/
@GetMapping("/expenseAccountApi/selectSocialVehicleExpenseAccount")
public R<List<QueryExpenseAccountDTO>> selectSocialVehicleExpenseAccount();
}
//package com.mhd.oms.infrastructure.feign;
//
//import com.mhd.common.core.constant.ServiceNameConstants;
//import com.mhd.common.core.domain.dto.BasicAgreementDTO;
//import com.mhd.common.core.domain.dto.SysMultistageDictDto;
//import com.mhd.common.core.domain.dto.SysProvinceCityCountyDTO;
//import com.mhd.common.core.domain.dto.open.SystemOpenApiLogDTO;
//import com.mhd.common.core.domain.dto.open.ThirdPartyServiceReqLogDTO;
//import com.mhd.common.core.domain.entity.R;
//import com.mhd.common.core.domain.po.SysMultistageDictPo;
//import com.mhd.common.core.web.domain.AjaxResult;
//import com.mhd.common.core.web.page.TableDataInfo;
//import com.mhd.oms.infrastructure.feign.dto.AbnormalAddressBookDTO;
//import com.mhd.oms.infrastructure.feign.dto.NoticeMessageLoggingDto;
//import com.mhd.oms.infrastructure.feign.dto.QueryExpenseAccountDTO;
//import com.mhd.oms.infrastructure.feign.po.NoticeMessageLoggingPo;
//import com.mhd.system.api.domain.SysDictData;
//import com.mhd.system.api.feign.FeignAutoConfiguration;
//import com.mhd.system.api.model.LoginUser;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//
///**
// * @Description
// * @Author zg
// * @Version 1.0
// * @Date 2023/11/1 13:40
// */
//@FeignClient(contextId = "SystemServiceFeign", value = ServiceNameConstants.SYSTEM_SERVICE, configuration = FeignAutoConfiguration.class)
//public interface SystemServiceFeign {
//
// /**
// * 多级分类字典,根据code查询字典信息
// * 此接口查询多级分类字典,如果是一级字典,则只需传入字典code,如果是二级或三级字典,则还需要传入父类code,否则会查询失败
// *
// * @param multistageDictCode 本级code
// * @param parentDictCode 父级code
// * @return
// */
// @GetMapping("/basicApi/getMultistageDictInfoByCode")
// public AjaxResult getMultistageDictInfoByCode(@RequestParam("multistageDictCode") String multistageDictCode, @RequestParam("parentDictCode") String parentDictCode);
//
//
// /**
// * 查询多级分类字典
// *
// * @param sysMultistageDictDto
// * @return
// */
// @GetMapping("/basicApi/selectMultistageDictList")
// public AjaxResult selectMultistageDictList(SysMultistageDictDto sysMultistageDictDto);
//
// /**
// * 根据字典类型查询字典数据信息
// *
// * @param dictType
// * @return
// */
// @GetMapping("/dict/data/type/{dictType}")
// public AjaxResult selectListByDictType(@PathVariable("dictType") String dictType);
//
//
// /**
// * 根据县级编码,查询省市县信息
// *
// * @param sysProvinceDTO
// * @return
// */
// @PostMapping("/basicApi/findAreaInfo")
// public AjaxResult selectFindAreaInfoList(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
//
// /**
// * 根据市区编码查询市区信息
// *
// * @param sysProvinceDTO
// * @return
// */
// @PostMapping("/basicApi/findAreaInfoByCityCode")
// public AjaxResult findAreaInfoByCityCode(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
//
// /**
// * 根据省份编码查询省份信息
// *
// * @param sysProvinceDTO
// * @return
// */
// @PostMapping("/basicApi/findAreaInfoByProvince")
// public AjaxResult findAreaInfoByProvince(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
//
//
// //=================================
//
// /**
// * 查询字典数据详细
// *
// * @param dictCode
// * @return
// */
// @GetMapping("/dict/data/{dictCode}")
// public AjaxResult getTopOrganization(@PathVariable("dictCode") Long dictCode);
//
// /**
// * 根据条件查询字典数据列表
// * @param sysDictData
// * @return
// */
// @PostMapping("/dict/data/findDatalist")
// public AjaxResult findDatalist(@RequestBody SysDictData sysDictData);
//
// /**
// * 根据条件查询分类字典数据列表
// * @param
// * @return
// */
// @PostMapping("/basicApi/getMultistageDictList")
// public R<List<SysMultistageDictPo>> getMultistageDictList(@RequestBody SysMultistageDictDto sysMultistageDictDto);
//
// /**
// * 根据条件查询分类字典数据列表
// * @param
// * @return
// */
// @PostMapping("/basicApi/getMultistageDictTreeList")
// public R<List<SysMultistageDictPo>> getMultistageDictTreeList(@RequestBody SysMultistageDictDto sysMultistageDictDto);
//
//
// /**
// * 根据条件查询分类字典数据列表
// * @param
// * @return
// */
// @PostMapping("/dict/data/getDictDataList")
// public R<List<SysDictData>> getDictDataList(@RequestBody SysDictData sysDictData);
//
// /**
// * 查询省市县三级
// *
// * @param sysProvinceDTO
// * @return
// */
// @PostMapping("/basicApi/selectAreaChildrenList")
// public TableDataInfo selectAreaChildrenList(@RequestBody SysProvinceCityCountyDTO sysProvinceDTO);
//
// /**
// * 根据code查询分类字典信息
// *
// * @param multistageDictCode
// * @return
// */
// @GetMapping(value = "/basicApi/getMultistageDictInfoByCode/{multistageDictCode}")
// public AjaxResult getMultistageDictInfoByCode(@PathVariable(value = "multistageDictCode", required = true) String multistageDictCode);
//
// /**
// * 根据code查询多级分类字典集合
// *
// * @param code
// * @return
// */
// @GetMapping(value = "/basicApi/getSysMultistageDictList/{code}")
// public AjaxResult getSysMultistageDictList(@PathVariable(value = "code") String code);
//
// /**
// * 根据topCode查询多级分类字典集合(同一父级字典下所有)
// *
// * @param topCode
// * @return
// */
// @GetMapping(value = "/basicApi/getTopMultistageDictList/{topCode}")
// public AjaxResult getTopMultistageDictList(@PathVariable(value = "topCode") String topCode);
//
// /**
// * 新增消息通知 单条
// *
// * @param noticeMessageLoggingDto
// * @return
// */
// @PostMapping("/messageManageApi/addMessageLogging")
// public AjaxResult addMessageLogging(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
//
// /**
// * 消息记录列表查询-feign
// *
// * @return
// */
// @ApiOperation("消息记录列表查询-feign")
// @PostMapping("/messageManageApi/noticeMessageLoggingListByFeign")
// public List<NoticeMessageLoggingPo> noticeMessageLoggingListByFeign(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
//
// /**
// * 新增消息通知 批量
// *
// * @param noticeMessageLoggingDto
// * @return
// */
// @PostMapping("/messageManageApi/addMessageLoggingList")
// public AjaxResult addMessageLoggingList(@RequestBody NoticeMessageLoggingDto noticeMessageLoggingDto);
//
// /**
// * 根据协议code和租户查询系统协议
// */
// @GetMapping("/basicApi/findAgreementByCodeAndOrg")
// public AjaxResult findAgreementByCodeAndOrg(BasicAgreementDTO basicAgreementDTO);
//
// /**
// * 获取指定组织的开关按钮配置-feign
// */
// @ApiOperation("获取指定组织的开关按钮配置")
// @GetMapping("/userConfigSwitchApi/getUserConfigSwitchInfoByOrgId")
// public AjaxResult getUserConfigSwitchInfoByOrgId(@RequestParam("organizationId") Long organizationId);
//
// /**
// * 获取当前租户开关按钮配置-feign
// */
// @ApiOperation("获取当前租户开关配置信息")
// @PostMapping("/userConfigSwitchApi/getUserConfigSwitchInfoByFeign")
// public AjaxResult getUserConfigSwitchInfoByFeign(@RequestBody LoginUser loginUser);
//
// @ApiOperation("根据code、一级组织ID查询多级分类字典集合")
// @GetMapping(value = "/basicApi/getSysMultistageDictByCodeAndTopOrgId")
// public AjaxResult getSysMultistageDictByCodeAndTopOrgId(@RequestParam("code") String code, @RequestParam("topOrgId") Long topOrgId);
//
// @ApiOperation("根据topCode、一级组织ID查询多级分类字典集合(同一父级字典下所有)")
// @GetMapping(value = "/basicApi/getMultistageDictListByTopCodeAndTopOrgId")
// public AjaxResult getMultistageDictListByTopCodeAndTopOrgId(@RequestParam("topCode") String topCode, @RequestParam("topOrgId") Long topOrgId);
//
// @ApiOperation("新增多级分类字典-开放接口")
// @PostMapping("/basicApi/addMultistageDictByOpen")
// public AjaxResult addMultistageDictByOpen(@RequestBody SysMultistageDictDto sysMultistageDictDto);
//
// /**
// * @description 保存请求服务日志
// * @author ZhouGY
// * @date 2024/1/26 17:03
// * @param systemOpenApiLogDTO
// */
// @PostMapping(value = "/systemOpenApiLogApi/save")
// public AjaxResult saveLog(@RequestBody SystemOpenApiLogDTO systemOpenApiLogDTO);
//
// /**
// * @description 保存三方服务日志
// * @author ZhouGY
// * @date 2024/1/26 17:03
// * @param thirdPartyServiceReqLogDTO
// */
// @PostMapping(value = "/thirdPartyServiceReqLogApi/save")
// public AjaxResult saveThirdPartyServiceReqLog(@RequestBody ThirdPartyServiceReqLogDTO thirdPartyServiceReqLogDTO);
//
// /**
// * 获取用户所在租户的开关配置信息
// * @return
// */
// @GetMapping("/userConfigSwitchApi/getUserConfigSwitchInfo")
// public AjaxResult getUserConfigSwitchInfo();
//
// /**
// * 编辑异常匹配地址簿
// * @return
// */
// @PostMapping("/abnormalAddressBookApi/saveBatchAddressBook")
// public AjaxResult saveBatchAddressBook(@RequestBody List<AbnormalAddressBookDTO> abnormalAddressBookDTOList);
//
// /**
// * 匹配地址簿
// * @return
// */
// @PostMapping("/abnormalAddressBookApi/matchAddressBook")
// public AjaxResult matchAddressBook(@RequestBody AbnormalAddressBookDTO abnormalAddressBookDTO);
// /**
// * 查询社会车辆-费用科目
// * @return
// */
// @GetMapping("/expenseAccountApi/selectSocialVehicleExpenseAccount")
// public R<List<QueryExpenseAccountDTO>> selectSocialVehicleExpenseAccount();
//}
@@ -107,8 +107,7 @@ public class BusinessDocumentOrderApi extends BaseController{
*/
@ApiOperation("批量取消执行【业务单】")
@PostMapping("/cancelExecute")
public AjaxResult cancelExecute(@RequestParam("ids") Long[] ids)
{
public AjaxResult cancelExecute(@RequestParam("ids") Long[] ids) throws Exception {
try {
return toAjax(businessDocumentOrderApplicationService.cancelExecute(ids));
} catch (Exception e) {