diff --git a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java index a2bf8f8..329f2f6 100644 --- a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java @@ -1,5 +1,6 @@ package com.glxp.mipsdl.client; +import com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter; import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeFilter; @@ -280,4 +281,5 @@ public interface BaseHttpClient { */ BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest); + BaseResponse getDeviceBusinessProject(DeviceBusinessProject deviceBusinessProject); } diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index f0fa86c..9447edb 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -2,6 +2,7 @@ package com.glxp.mipsdl.client; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; +import com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; @@ -305,4 +306,9 @@ public abstract class CommonHttpClient implements BaseHttpClient { public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { return null; } + + @Override + public BaseResponse getDeviceBusinessProject(DeviceBusinessProject deviceBusinessProject) { + return null; + } } diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 93b21ae..28eea24 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -13,10 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.client.CommonHttpClient; -import com.glxp.mipsdl.client.ptxhyy.entity.HisProductEntity; -import com.glxp.mipsdl.client.ptxhyy.entity.OrderUploadResponse; -import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity; -import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbService; +import com.glxp.mipsdl.client.ptxhyy.entity.*; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; @@ -60,6 +57,7 @@ import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; +import com.glxp.mipsdl.thirddao.dtxyy.DeviceBusinessProjectMapper; import com.glxp.mipsdl.thirddao.ptxhyy.PtxhyySickerMapper; import com.glxp.mipsdl.util.*; import lombok.RequiredArgsConstructor; @@ -652,4 +650,13 @@ public class PtxhyyClient extends CommonHttpClient { pageSimpleResponse.setList(basicSkSickerResponses); return ResultVOUtils.success(pageSimpleResponse); } + + @Resource + DeviceBusinessProjectMapper deviceBusinessProjectMapper; + + @Override + public BaseResponse getDeviceBusinessProject(DeviceBusinessProject deviceBusinessProject){ + List deviceBusinessProjects = deviceBusinessProjectMapper.selectList(deviceBusinessProject); + return ResultVOUtils.success(deviceBusinessProjects); + } } diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java new file mode 100644 index 0000000..034c92a --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java @@ -0,0 +1,58 @@ +package com.glxp.mipsdl.client.ptxhyy.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class DeviceBusinessProject { + + /** + * 收费时间 + */ + @TableField(value = "chargTime") + private Date chargTime; + + /** + * 收费项目 + */ + @TableField(value = "sfxm") + private String sfxm; + + /** + * 收费名称 + */ + @TableField(value = "sfmc") + private String sfmc; + + /** + * 收费金额 + */ + @TableField(value = "je") + private BigDecimal je; + + /** + * 收费mz + */ + @TableField(value = "sfmz") + private String sfmz; + + /** + * 当前部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 当前部门编码 + */ + @TableField(value = "deptName") + private String deptName; + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java index 10522e4..4ba72ac 100644 --- a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java +++ b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java @@ -2,6 +2,7 @@ package com.glxp.mipsdl.controller; import com.glxp.mipsdl.client.ClientProcessor; import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity; +import com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject; import com.glxp.mipsdl.client.pzh.PzhzdClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest; @@ -331,4 +332,15 @@ public class UdiWmsController { return ClientProcessor.getHttpClient().getThrOrders(udiwmsThrOrderRequest); } + + /** + * 获取设备的收费项目收益明细 + * @param deviceBusinessProject + * @return + */ + @PostMapping("/udiwms/erp/getDeviceBusinessProject") + public BaseResponse getDeviceBusinessProject(@RequestBody DeviceBusinessProject deviceBusinessProject) { + return ClientProcessor.getHttpClient().getDeviceBusinessProject(deviceBusinessProject); + } + } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java new file mode 100644 index 0000000..950e3ea --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java @@ -0,0 +1,18 @@ +package com.glxp.mipsdl.thirddao.dtxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject; +import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +@DS("dtxyysql") +public interface DeviceBusinessProjectMapper extends BaseMapper { + + List selectList(DeviceBusinessProject deviceBusinessProject); + +} diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 8598a46..3e31532 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -19,6 +19,11 @@ spring: username: root password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver + dtxyysql: + url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml new file mode 100644 index 0000000..5eacba3 --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file