From ad6c3e64ea78c6ff2c38e9c79e8b234212be88d5 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 6 Sep 2024 11:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BB=8E=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BF=87=E6=9D=A5=E7=9A=84=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/MaReceiveController.java | 14 +++++--------- .../sgzb/base/domain/DataReceiveDetail.java | 2 ++ .../sgzb/base/mapper/MaReceiveMapper.java | 3 ++- .../sgzb/base/service/MaReceiveService.java | 2 +- .../service/impl/MaReceiveServiceImpl.java | 19 +++++++++++++++++-- .../resources/mapper/base/MaReceiveMapper.xml | 10 +++++----- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java index 791bf62..000ec39 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java @@ -9,6 +9,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,20 +33,15 @@ public class MaReceiveController extends BaseController { */ @ApiOperation(value = "获取推送数据") @PostMapping("/dataReceive") - public AjaxResult getProjectInfoAll(@RequestBody List dataReceiveDetails) { - if (CollUtil.isEmpty(dataReceiveDetails)) { + public AjaxResult getProjectInfoAll(@RequestBody String maMachineRequest) { + if (StringUtils.isEmpty(maMachineRequest)) { return AjaxResult.error("推送数据为空"); } - DataReceiveInfo dataReceiveInfo = new DataReceiveInfo(); - dataReceiveInfo.setPushNum(dataReceiveDetails.size()); - int id = maReceiveService.saveDataReceiveInfo(dataReceiveInfo); + + int id = maReceiveService.saveDataReceiveInfo(maMachineRequest); if (id == 0) { return AjaxResult.error("推送数据失败"); } - for (DataReceiveDetail dataReceiveDetail : dataReceiveDetails) { - dataReceiveDetail.setReceiveId(id); - maReceiveService.saveDataReceiveDetails(dataReceiveDetail); - } return AjaxResult.success("数据推送成功"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java index 8c4ccde..f209d30 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java @@ -85,4 +85,6 @@ public class DataReceiveDetail { @ApiModelProperty(value = "数据来源（0新购 1盘点 2数据推送）") private Integer souceBy; + @ApiModelProperty(value = "接收人") + private String userIds; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java index d574a3c..769f583 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.base.mapper; import com.bonus.sgzb.base.domain.DataReceiveDetail; import com.bonus.sgzb.base.domain.DataReceiveInfo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,5 +25,5 @@ public interface MaReceiveMapper { List getDateReceiveMachine(DataReceiveDetail dataReceiveDetail); - int updateInfoStatus(Integer id); + int updateInfoStatus(@Param("id") Integer id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java index 087cf15..427acd2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java @@ -10,7 +10,7 @@ import java.util.List; * @Date：2024/7/24 - 13:20 */ public interface MaReceiveService { - int saveDataReceiveInfo(DataReceiveInfo dataReceiveInfo); + int saveDataReceiveInfo(String maMachineRequest); int saveDataReceiveDetails(DataReceiveDetail dataReceiveDetail); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java index ce37e77..3bb9806 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.base.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.domain.DataReceiveDetail; import com.bonus.sgzb.base.domain.DataReceiveInfo; @@ -7,6 +9,7 @@ import com.bonus.sgzb.base.mapper.MaMachineMapper; import com.bonus.sgzb.base.mapper.MaReceiveMapper; import com.bonus.sgzb.base.mapper.MaTypeMapper; import com.bonus.sgzb.base.service.MaReceiveService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +21,7 @@ import java.util.List; * @Author：liang.chao * @Date：2024/7/24 - 13:20 */ +@Slf4j @Service public class MaReceiveServiceImpl implements MaReceiveService { @@ -32,9 +36,20 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Override @Transactional - public int saveDataReceiveInfo(DataReceiveInfo dataReceiveInfo) { + public int saveDataReceiveInfo(String maMachineRequest) { + log.info("推送数据{}", maMachineRequest); + JSONObject object = JSONObject.parseObject(maMachineRequest); + maMachineRequest = object.getString("body"); + JSONArray dataArray = JSONArray.parseArray(maMachineRequest); + List dataReceiveDetails = dataArray.toJavaList(DataReceiveDetail.class); + DataReceiveInfo dataReceiveInfo = new DataReceiveInfo(); + dataReceiveInfo.setPushNum(dataReceiveDetails.size()); maReceiveMapper.saveDataReceiveInfo(dataReceiveInfo); if (dataReceiveInfo.getId() != null) { + for (DataReceiveDetail dataReceiveDetail : dataReceiveDetails) { + dataReceiveDetail.setReceiveId(dataReceiveInfo.getId()); + saveDataReceiveDetails(dataReceiveDetail); + } return dataReceiveInfo.getId(); } else { return 0; @@ -71,12 +86,12 @@ public class MaReceiveServiceImpl implements MaReceiveService { } @Override + @Transactional(rollbackFor = Exception.class) public int saveMachine(DataReceiveInfo dataReceiveInfo) { for (DataReceiveDetail dataReceiveDetail : dataReceiveInfo.getDataReceiveDetailList()) { MaMachine maMachine = new MaMachine(); maMachine.setMaCode(dataReceiveDetail.getMaCode()); maMachine.setTypeId(dataReceiveDetail.getTypeId()); - maMachine.setMaCode(dataReceiveDetail.getMaCode()); maMachine.setMaStatus("15"); maMachine.setCreateTime(new Date()); maMachine.setSouceBy(2); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml index ee9cc92..791331c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml @@ -9,20 +9,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values(#{pushNum},now()) - insert into data_receive_detail(receive_id,check_code,check_unit,check_date,is_new,ma_code,ma_user_name,next_check_date,out_factory_time,rent_price,rent_time,supplier,type_id,unit_id) - values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maCode},#{maUserName},#{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId}) + insert into data_receive_detail(receive_id,check_code,check_unit,check_date,is_new,ma_id,ma_user_name,next_check_date,out_factory_time,rent_price,rent_time,supplier,type_id,unit_id) + values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName},#{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId}) UPDATE data_receive_detail SET STATUS = 1, ma_id = #{maId} - where receive_id = #{receiveId} and type_id = #{typeId} - AND ma_code = #{maCode} + where id = #{id} + UPDATE data_receive_info SET receive_status = 1 - where id = #{receiveId} + where id = #{id}