bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓储接收租赁装备推送逻辑优化，租赁退租时，查询装备状态以及修改装备状态的接口编写

This commit is contained in:
15856 2024-10-31 18:34:57 +08:00
parent b781f676cd
commit 90ce9f0f3f
10 changed files with 121 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
View File

@ -30,9 +30,9 @@ public class MaReceiveController extends BaseController {
private MaReceiveService maReceiveService;
/**
* 数据推送接收
* 接收租赁推送的数据
*/
@ApiOperation(value = "获取推送数据")
@ApiOperation(value = "接收租赁推送的数据")
@PostMapping("/dataReceive")
public AjaxResult getProjectInfoAll(@RequestBody String maMachineRequest) {
if (StringUtils.isEmpty(maMachineRequest)) {
@ -86,7 +86,7 @@ public class MaReceiveController extends BaseController {
}
@ApiOperation(value = "数据接收")
@ApiOperation(value = "查看数据接收详情")
@GetMapping("/getDateReceiveMachine")
public TableDataInfo getDateReceiveMachine(DataReceiveDetail dataReceiveDetail) {
startPage();

21
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @Author：liang.chao
@ -41,6 +42,11 @@ public class DataReceiveDetail {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rentTime;
@ApiModelProperty(value = "租赁结束日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderOverTime;
@ApiModelProperty(value = "租赁价格")
private String rentPrice;
@ -77,6 +83,18 @@ public class DataReceiveDetail {
@ApiModelProperty(value = "机手姓名")
private String maUserName;
@ApiModelProperty(value = "机手电话")
private String maUserPhone;
@ApiModelProperty(value = "机手身份证号")
private String maUserIdCard;
@ApiModelProperty(value = "机手性别(0女 1男)")
private Integer maUserSex;
@ApiModelProperty(value = "机手年龄")
private Integer maUserAge;
@ApiModelProperty(value = "关键字")
private String keyWord;
@ -90,4 +108,7 @@ public class DataReceiveDetail {
@ApiModelProperty(value = "租赁商城装备id")
private Long itemId;
@ApiModelProperty(value = "机手附件信息")
private List<EnterpriseDriverFile> enterpriseDriverFile;
}

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java Normal file
View File

@ -0,0 +1,24 @@
package com.bonus.sgzb.base.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class EnterpriseDriverFile {
@ApiModelProperty(value = "ID")
private Integer id;
@ApiModelProperty(value = "推送详情id")
private Integer receiveDetailId;
@ApiModelProperty(value = "附件名称")
private String file_name;
@ApiModelProperty(value = "附件地址")
private String fileUrl;
@ApiModelProperty(value = "附件类型（0反面，1正面，2持证信息）")
private Integer fileType;
}

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/EnterpriseDriverFileMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.domain.EnterpriseDriverFile;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface EnterpriseDriverFileMapper {
void insertEnterpriseDriverFile(EnterpriseDriverFile enterpriseDriverFile);
List<EnterpriseDriverFile> selectEnterpriseDriverFileByReceiveDetailId(Integer id);
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
View File

@ -48,4 +48,8 @@ public interface MaMachineMapper {
* @return
*/
int updateNum(long typeId);
Long selectMaMachineByItemId(Long itemId);
Integer updateItemStatus(Long itemId);
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java
View File

@ -26,8 +26,4 @@ public interface MaReceiveMapper {
List<DataReceiveDetail> getDateReceiveMachine(DataReceiveDetail dataReceiveDetail);
int updateInfoStatus(@Param("id") Integer id);
Long selectMaMachineByItemId(Long itemId);
Integer updateItemStatus(Long itemId);
}

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
View File

@ -5,6 +5,8 @@ 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;
import com.bonus.sgzb.base.domain.EnterpriseDriverFile;
import com.bonus.sgzb.base.mapper.EnterpriseDriverFileMapper;
import com.bonus.sgzb.base.mapper.MaMachineMapper;
import com.bonus.sgzb.base.mapper.MaReceiveMapper;
import com.bonus.sgzb.base.mapper.MaTypeMapper;
@ -34,6 +36,9 @@ public class MaReceiveServiceImpl implements MaReceiveService {
@Resource
private MaTypeMapper maTypeMapper;
@Resource
private EnterpriseDriverFileMapper enterpriseDriverFileMapper;
@Override
@Transactional
public int saveDataReceiveInfo(String maMachineRequest) {
@ -60,10 +65,19 @@ public class MaReceiveServiceImpl implements MaReceiveService {
@Transactional
public int saveDataReceiveDetails(DataReceiveDetail dataReceiveDetail) {
int i = 0;
//保存推送详情
i = maReceiveMapper.saveDataReceiveDetails(dataReceiveDetail);
if (i == 0) {
throw new RuntimeException("保存失败");
}
//保存机手附件信息
List<EnterpriseDriverFile> enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFile();
if (enterpriseDriverFileList != null && !enterpriseDriverFileList.isEmpty()){
for (EnterpriseDriverFile enterpriseDriverFile : enterpriseDriverFileList) {
enterpriseDriverFile.setReceiveDetailId(dataReceiveDetail.getId());
enterpriseDriverFileMapper.insertEnterpriseDriverFile(enterpriseDriverFile);
}
}
return i;
}
@ -82,7 +96,11 @@ public class MaReceiveServiceImpl implements MaReceiveService {
@Override
public List<DataReceiveDetail> getDataReceiveDetails(DataReceiveDetail dataReceiveDetail) {
return maReceiveMapper.getDataReceiveDetails(dataReceiveDetail);
List<DataReceiveDetail> dataReceiveDetails = maReceiveMapper.getDataReceiveDetails(dataReceiveDetail);
dataReceiveDetails.forEach(dataReceiveDetail1 -> {
dataReceiveDetail1.setEnterpriseDriverFile(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId()));
});
return dataReceiveDetails;
}
@Override
@ -132,11 +150,11 @@ public class MaReceiveServiceImpl implements MaReceiveService {
@Override
public Long getItemStatus(Long itemId) {
return maReceiveMapper.selectMaMachineByItemId(itemId);
return maMachineMapper.selectMaMachineByItemId(itemId);
}
@Override
public Integer updateItemStatus(Long itemId) {
return maReceiveMapper.updateItemStatus(itemId);
return maMachineMapper.updateItemStatus(itemId);
}
}

11
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -272,6 +272,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateNum">
update ma_type set num = num - 1 where type_id = #{typeId}
</update>
<update id="updateItemStatus">
UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id
SET mm.ma_status = 130
where drd.item_id = #{itemId}
</update>
<delete id="remove" parameterType="Long">
delete from ma_machine where ma_id in
@ -369,4 +374,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaMachineByMaTypeAndMaCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
select * from ma_machine where qr_code = #{qrCode} or ma_code = #{maCode}
</select>
<select id="selectMaMachineByItemId" resultType="java.lang.Long">
SELECT mm.ma_status FROM ma_machine mm
left join data_receive_detail drd on mm.ma_id = drd.ma_id
WHERE drd.item_id = #{itemId}
</select>
</mapper>

22
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml
View File

@ -8,9 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into data_receive_info(push_num,receive_date)
values(#{pushNum},now())
</insert>
<insert id="saveDataReceiveDetails">
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})
<insert id="saveDataReceiveDetails" keyProperty="id" useGeneratedKeys="true">
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,order_over_time,ma_user_phone,ma_user_id_card,
ma_user_sex,ma_user_age)
values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName},
#{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId},
#{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge})
</insert>
<update id="updateStatus">
UPDATE data_receive_detail
@ -24,11 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SET receive_status = 1
where id = #{id}
</update>
<update id="updateItemStatus">
UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id
SET mm.ma_status = 130
where drd.item_id = #{itemId}
</update>
<select id="getDataReceive" resultType="com.bonus.sgzb.base.domain.DataReceiveInfo">
select * from data_receive_info where 1=1
<if test="receiveStatus != null">
@ -92,10 +92,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getDataReceiveDetailsById" resultType="com.bonus.sgzb.base.domain.DataReceiveDetail">
SELECT * FROM data_receive_detail WHERE receive_id = #{receiveId}
</select>
<select id="selectMaMachineByItemId" resultType="java.lang.Long">
SELECT mm.ma_status FROM ma_machine mm
left join data_receive_detail drd on mm.ma_id = drd.ma_id
WHERE drd.item_id = #{itemId}
</select>
</mapper>

15
sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.EnterpriseDriverFileMapper">
<insert id="insertEnterpriseDriverFile">
insert into base_enterprise_driver_file(receive_detail_id,file_name,file_url,file_type)
values(#{receiveDetailId},#{fileName},#{fileUrl},#{fileType})
</insert>
<select id="selectEnterpriseDriverFileByReceiveDetailId"
resultType="com.bonus.sgzb.base.domain.EnterpriseDriverFile">
select * from enterprise_driver_file where receive_detail_id = #{receiveDetailId}
</select>
</mapper>