From 10ac23172a5f0792e431d21f82f9a4b54668181f Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 21 Jul 2023 11:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shstorehouse/ShStorehouseDetailsVo.java | 2 ++ .../wh/pojo/shstorehouse/ShStorehouseDto.java | 2 ++ .../StoreHouseProjectDto.java | 6 ++-- .../shstorehouse/ShStorehouseRest.java | 14 +++++--- .../wh/feign/crm/ProjectInformationFeign.java | 22 ++++++++++++ .../shstorehouse/ShStorehouseService.java | 35 +++++++++++++++++-- .../StoreHouseProjectService.java | 6 ++-- .../mappers/ShStorehouseAttachmentMapper.xml | 2 +- .../StoreHouseProjectDto.java | 4 +-- .../ProjectInformationMapper.java | 3 ++ .../ProjectInformationRest.java | 23 +++++++++--- .../ProjectInformationService.java | 4 +++ .../{ => feign}/wh/ShStorehouseFeign.java | 2 +- .../{ => feign}/wh/ShStorehouseQuery.java | 2 +- .../supervise/system/flow/FlowableRest.java | 15 ++------ 15 files changed, 106 insertions(+), 36 deletions(-) create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/feign/crm/ProjectInformationFeign.java rename yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/{ => feign}/wh/ShStorehouseFeign.java (95%) rename yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/{ => feign}/wh/ShStorehouseQuery.java (99%) diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java index 667cdcd0..9f5c77bb 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java @@ -104,4 +104,6 @@ public class ShStorehouseDetailsVo implements Vo { private String lon; @ApiModelProperty("维度") private String lat; + private String projectSid;//项目sid + private String projectName;//项目名称 } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java index 64bd2b0c..8f656260 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java @@ -27,6 +27,7 @@ package com.wh.pojo.shstorehouse; import com.wh.pojo.shstorehouseattribute.ShStorehouseAttributeDto; +import com.wh.pojo.storehouseproject.StoreHouseProjectDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -105,4 +106,5 @@ public class ShStorehouseDto implements Dto { private String lon; @ApiModelProperty("维度") private String lat; + private String projectSid;//项目sid } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java index 84164bd6..9944b05f 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java @@ -3,6 +3,8 @@ package com.wh.pojo.storehouseproject; import com.yxt.common.core.dto.Dto; import lombok.Data; +import java.util.List; + /** * @author wangpengfei * @date 2023/7/19 15:37 @@ -11,6 +13,6 @@ import lombok.Data; public class StoreHouseProjectDto implements Dto { private String id; private String sid; - private String shSid; - private String projectSid; + private String shSid;//仓库sid + private String projectSid;//项目sid } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java index 6aa98c94..5c0b6e5e 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java @@ -26,6 +26,7 @@ package com.wh.controller.shstorehouse; import cn.hutool.core.lang.Assert; +import com.wh.feign.crm.ProjectInformationFeign; import com.wh.feign.enterpriseinformation.WhEnterpriseInformationFeign; import com.wh.feign.enterpriseinformation.WhEnterpriseInformationVo; import com.wh.pojo.shstorehouse.*; @@ -73,6 +74,8 @@ public class ShStorehouseRest { private ShStorehouseAttachmentService shStorehouseAttachmentService; @Autowired private WhEnterpriseInformationFeign whEnterpriseInformationFeign; + @Autowired + private ProjectInformationFeign projectInformationFeign; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ @@ -80,13 +83,14 @@ public class ShStorehouseRest { PagerVo pv = shStorehouseService.listPageVo(pq); return rb.success().setData(pv); } - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/selectSh") - public ResultBean> selectSh(@RequestBody PagerQuery pq){ + @ApiOperation("查询项目所有") + @GetMapping("/selectAllProject") + public ResultBean selectAllProject(){ ResultBean rb = ResultBean.fireFail(); - List pv = shStorehouseService.selectSh(pq); - return rb.success().setData(pv); + ResultBean resultBean = projectInformationFeign.listAll(); + return resultBean; } + @ApiOperation("根据项目sid查询仓库") @GetMapping("/getStorehouseBySid") public ResultBean> getStorehouseBySid(String sid){ diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/crm/ProjectInformationFeign.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/crm/ProjectInformationFeign.java new file mode 100644 index 00000000..98cec6e2 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/crm/ProjectInformationFeign.java @@ -0,0 +1,22 @@ +package com.wh.feign.crm; + +import com.yxt.common.core.result.ResultBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author wangpengfei + * @date 2023/7/21 9:19 + */ +@FeignClient( + contextId = "supervise-crm-projectinformation", + name = "supervise-crm", + path = "v1/projectinformation") +public interface ProjectInformationFeign { + @GetMapping("/listAll") + public ResultBean listAll(); + @GetMapping("/getProjectNameBySid") + public String getProjectNameBySid(@RequestParam("sid")String sid); +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java index 443abdb8..10fe99a1 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java @@ -28,14 +28,17 @@ package com.wh.service.shstorehouse; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wh.feign.crm.ProjectInformationFeign; import com.wh.mapper.shstorehouse.ShStorehouseMapper; import com.wh.pojo.shstorehouse.*; import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentDetailsVo; import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentDto; import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentVo; +import com.wh.pojo.storehouseproject.StoreHouseProject; +import com.wh.pojo.storehouseproject.StoreHouseProjectDto; import com.wh.service.shstorehouseattachment.ShStorehouseAttachmentService; +import com.wh.service.storehouseproject.StoreHouseProjectService; import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.config.component.ImageUploadUtil; import com.yxt.common.core.result.FileUploadResult; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -49,7 +52,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.util.*; /** @@ -71,6 +73,10 @@ public class ShStorehouseService extends MybatisBaseService createQueryWrapper(ShStorehouseQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -92,7 +98,7 @@ public class ShStorehouseService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public List selectSh(PagerQuery pq) { + public List selectSh() { List pagging = baseMapper.selectSh(); return pagging; } @@ -137,6 +143,11 @@ public class ShStorehouseService extends MybatisBaseService().eq("sh_sid",dto.getSid())); + StoreHouseProjectDto dto1=new StoreHouseProjectDto(); + if(null==storeHouseProject){ + dto1.setShSid(entity.getSid()); + dto1.setProjectSid(dto.getProjectSid()); + }else{ + BeanUtil.copyProperties(dto1, storeHouseProject, "id", "sid"); + } + storeHouseProjectService.saveOrUpdateDto(dto1); baseMapper.updateById(entity); } @@ -193,6 +214,14 @@ public class ShStorehouseService extends MybatisBaseService pics=shStorehouseAttachmentService.fetchDetailsVoByShSid(sid); BeanUtil.copyProperties(entity, vo); + StoreHouseProject s=storeHouseProjectService.getOne(new QueryWrapper().eq("sh_sid",sid)); + if(null==s){ + + }else{ + vo.setProjectSid(s.getProjectSid()); + String r=projectInformationFeign.getProjectNameBySid(s.getProjectSid()); + vo.setProjectName(r); + } vo.setPics(pics); return vo; } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java index 24379466..fddbbd52 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java @@ -23,7 +23,7 @@ import java.util.*; @Service public class StoreHouseProjectService extends MybatisBaseService { @Transactional - public void saveOrUpdateDto(StoreHouseProjectDto dto){ + public void saveOrUpdateDto(StoreHouseProjectDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { @@ -34,12 +34,12 @@ public class StoreHouseProjectService extends MybatisBaseService \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java index 57f11aa3..fd0528c9 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java @@ -11,6 +11,6 @@ import lombok.Data; public class StoreHouseProjectDto implements Dto { private String id; private String sid; - private String shSid; - private String projectSid; + private String shSid;//仓库sid + private String projectSid;//项目sid } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java index 51390a75..0cd06731 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java @@ -8,6 +8,7 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformation; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -19,6 +20,8 @@ import java.util.Map; @Mapper public interface ProjectInformationMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from project_information") + List listAll(); ProjectInformationVo getProjectBySid( @Param("sid") String sid); void insertFiles(List> maps); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index 90663ac6..9dc18d20 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -1,12 +1,10 @@ package com.yxt.supervise.crm.biz.projectinformation; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto; -import com.yxt.supervise.crm.api.projectinformation.ProjectInformationFeign; -import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery; -import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import com.yxt.supervise.crm.api.projectinformation.*; import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign; import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign; @@ -15,6 +13,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2023/4/12 17:10 @@ -37,7 +37,13 @@ public class ProjectInformationRest implements ProjectInformationFeign { PagerVo pv = ProjectInformationService.listPageVo(pq); return rb.success().setData(pv); } - + @ApiOperation("根据条件分页查询数据的列表") + @GetMapping("/listAll") + public ResultBean> listAll() { + ResultBean rb = ResultBean.fireFail(); + List list =ProjectInformationService.listAll(); + return rb.success().setData(list); + } @ApiOperation("保存") @PostMapping("/save") public ResultBean save(@RequestBody ProjectInformationDto dto) { @@ -63,6 +69,13 @@ public class ProjectInformationRest implements ProjectInformationFeign { ResultBean r=shStorehouseFeign.getStorehouseBySid(sid); return r; } + @ApiOperation("根据sid查询项目名称") + @GetMapping("/getProjectNameBySid") + public String getProjectNameBySid (@RequestParam("sid")String sid){ + String r=ProjectInformationService.getOne(new QueryWrapper().eq("sid",sid)).getEntryName(); + return r; + } + @ApiOperation("项目绑定或修改仓库") @GetMapping("/saveOrUpdateDto") public ResultBean saveOrUpdateDto (@RequestBody StoreHouseProjectDto dto){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index db3c840d..fa87ec72 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -34,6 +34,10 @@ public class ProjectInformationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + public List listAll() { + List pagging = baseMapper.listAll(); + return pagging; + } public ResultBean save(ProjectInformationDto dto) { ResultBean rb=new ResultBean(); ProjectInformation entity=new ProjectInformation(); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseFeign.java similarity index 95% rename from yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseFeign.java rename to yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseFeign.java index 0ecc6d88..3bac732b 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseFeign.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.wh; +package com.yxt.supervise.feign.wh; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseQuery.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseQuery.java similarity index 99% rename from yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseQuery.java rename to yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseQuery.java index d7d7a22c..a675130c 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseQuery.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/wh/ShStorehouseQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.supervise.wh; +package com.yxt.supervise.feign.wh; import com.yxt.common.core.query.Query; diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java index a95d278e..e95fe67b 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java @@ -25,32 +25,21 @@ *********************************************************/ package com.yxt.supervise.system.flow; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; -import com.yxt.anrui.flowable.api.processcomment.ProcessCommentVo; -import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.system.flow.app.FlowTaskDoQuery; -import com.yxt.supervise.system.flow.app.FlowTaskDoVo; -import com.yxt.supervise.system.flow.app.FlowTaskFinishVo; import com.yxt.supervise.system.sysstafforg.SysStaffOrgService; import com.yxt.supervise.system.sysstafforg.SysStaffOrgVo; import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserService; -import com.yxt.supervise.wh.ShStorehouseFeign; -import com.yxt.supervise.wh.ShStorehouseQuery; +import com.yxt.supervise.feign.wh.ShStorehouseFeign; +import com.yxt.supervise.feign.wh.ShStorehouseQuery; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Map; /** * Project: anrui-parent