diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ UPDATE eqpt_equipment_info SET RFID = #{request.label} - WHERE id = #{request.sampleId} + WHERE id = #{request.equipmentId} + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index 872b198..3d9eab7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * 标签绑定 + * */ @Data @ApiModel("设备扫描参数") @@ -19,5 +19,5 @@ @NotNull @ApiModelProperty("样品id（测量设备中未设备主键id）") - private String sampleId; + private String equipmentId; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index 872b198..3d9eab7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * 标签绑定 + * */ @Data @ApiModel("设备扫描参数") @@ -19,5 +19,5 @@ @NotNull @ApiModelProperty("样品id（测量设备中未设备主键id）") - private String sampleId; + private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index 91097b7..977109c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -329,6 +329,9 @@ @TableField(exist = false) private Integer approvalType; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField("label") + private String label; @ApiModelProperty(value = "设备类型(打印扩展使用，任何时候不需要传)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index 872b198..3d9eab7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * 标签绑定 + * */ @Data @ApiModel("设备扫描参数") @@ -19,5 +19,5 @@ @NotNull @ApiModelProperty("样品id（测量设备中未设备主键id）") - private String sampleId; + private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index 91097b7..977109c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -329,6 +329,9 @@ @TableField(exist = false) private Integer approvalType; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField("label") + private String label; @ApiModelProperty(value = "设备类型(打印扩展使用，任何时候不需要传)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index f64fa20..2118c40 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -344,4 +344,8 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField(exist = false) + private String label; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index 872b198..3d9eab7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * 标签绑定 + * */ @Data @ApiModel("设备扫描参数") @@ -19,5 +19,5 @@ @NotNull @ApiModelProperty("样品id（测量设备中未设备主键id）") - private String sampleId; + private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index 91097b7..977109c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -329,6 +329,9 @@ @TableField(exist = false) private Integer approvalType; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField("label") + private String label; @ApiModelProperty(value = "设备类型(打印扩展使用，任何时候不需要传)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index f64fa20..2118c40 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -344,4 +344,8 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField(exist = false) + private String label; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index d6c2491..7899304 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -12,6 +12,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.flowable.ApprovalRejectRequest; @@ -49,6 +51,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -396,6 +399,24 @@ return ReturnUtil.success(response); } + /** + * 1、查询是否绑定 + * 2、未绑定进行绑定，已绑定抛出绑定异常 + */ + @Override + public ReturnDTO> bindLabel(LabelBindDTO labelBindDTO) { + //查询委托书和样品关联表中的各状态的样品 + Long id = equipmentInfoMapper.isBindLabel(labelBindDTO.getLabel()); + if (ObjectUtils.isEmpty(id)) { + Integer updateFlag = equipmentInfoMapper.bindLabel(labelBindDTO); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + throw new BusinessException(BusinessExceptionEnum.LABEL_ALREADY_BIND); + } + @Override @Transactional public ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 8e875f0..c9fa53e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -6,6 +6,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -25,6 +27,7 @@ import javax.validation.Valid; import java.io.IOException; +import java.util.List; import java.util.Objects; /** @@ -101,10 +104,15 @@ return equipmentInfoService.detail(request); } + @ApiOperation("设备详情（基本信息）") + @PostMapping("/label/bind") + public ReturnDTO> labelBind(@RequestBody @Valid LabelBindDTO labelBindDTO) throws Exception { + return equipmentInfoService.bindLabel(labelBindDTO); + } + /** * 设备审批-同意使用通用接口即可 */ - @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java index e6c5e07..b05a546 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,9 @@ BizEquipmentInfo selectByNo(@Param("equipmentNo") String equipmentNo); int deleteByNo(@Param("equipmentNo") String equipmentNo); + + Long isBindLabel(@Param("label")String label); + + Integer bindLabel(@Param("request") LabelBindDTO labelBindDTO); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 7256ccf..932c656 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -55,7 +55,7 @@ + SELECT id + FROM biz_equipment_info + WHERE 1=1 + + and RFID =#{label} + + + + + UPDATE biz_equipment_info + SET label = #{request.label} + WHERE id = #{request.equipmentId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index 872b198..3d9eab7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * 标签绑定 + * */ @Data @ApiModel("设备扫描参数") @@ -19,5 +19,5 @@ @NotNull @ApiModelProperty("样品id（测量设备中未设备主键id）") - private String sampleId; + private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index 91097b7..977109c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -329,6 +329,9 @@ @TableField(exist = false) private Integer approvalType; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField("label") + private String label; @ApiModelProperty(value = "设备类型(打印扩展使用，任何时候不需要传)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index f64fa20..2118c40 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -344,4 +344,8 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "标签", dataType = "String") + @TableField(exist = false) + private String label; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index d6c2491..7899304 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -12,6 +12,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.flowable.ApprovalRejectRequest; @@ -49,6 +51,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -396,6 +399,24 @@ return ReturnUtil.success(response); } + /** + * 1、查询是否绑定 + * 2、未绑定进行绑定，已绑定抛出绑定异常 + */ + @Override + public ReturnDTO> bindLabel(LabelBindDTO labelBindDTO) { + //查询委托书和样品关联表中的各状态的样品 + Long id = equipmentInfoMapper.isBindLabel(labelBindDTO.getLabel()); + if (ObjectUtils.isEmpty(id)) { + Integer updateFlag = equipmentInfoMapper.bindLabel(labelBindDTO); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + throw new BusinessException(BusinessExceptionEnum.LABEL_ALREADY_BIND); + } + @Override @Transactional public ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java index 3dab420..8cfc6ed 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.*; +import com.casic.missiles.dto.business.dispatch.DeviceScanVO; +import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.model.equipment.BizEquipmentInfo; @@ -37,6 +39,8 @@ ReturnDTO detail(BaseDetailRequest request) throws Exception; + ReturnDTO> bindLabel(LabelBindDTO labelBindDTO); + ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request); ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);