浏览代码

新增设备维修记录接口

humingfen 5 年之前
父节点
当前提交
4008bdebed

+ 40 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/iot/device/IotPatientDeviceDO.java

@ -52,7 +52,14 @@ public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implement
    private String hospitalName;//归属社区名称
    private String hospitalName;//归属社区名称
    @Column(name = "imgs")
    @Column(name = "imgs")
    private String imgs;//领用协议,多个用逗号隔开
    private String imgs;//领用协议,多个用逗号隔开
    @Column(name = "status")
    private Integer status;//维修状态(1待维护 2已报修 3厂家接收 4厂家寄回 5待更换 6已更换)
    @Column(name = "damage_description")
    private String damageDescription;//损坏说明
    @Column(name = "damage_images")
    private String damageImages;//申请维修附件图片,多个用逗号隔开
    @Column(name = "repair_description")
    private String repairDescription;//维修说明
    public String getSaasId() {
    public String getSaasId() {
        return saasId;
        return saasId;
@ -197,4 +204,36 @@ public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implement
    public void setImgs(String imgs) {
    public void setImgs(String imgs) {
        this.imgs = imgs;
        this.imgs = imgs;
    }
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getDamageDescription() {
        return damageDescription;
    }
    public void setDamageDescription(String damageDescription) {
        this.damageDescription = damageDescription;
    }
    public String getDamageImages() {
        return damageImages;
    }
    public void setDamageImages(String damageImages) {
        this.damageImages = damageImages;
    }
    public String getRepairDescription() {
        return repairDescription;
    }
    public void setRepairDescription(String repairDescription) {
        this.repairDescription = repairDescription;
    }
}
}

+ 4 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@ -143,6 +143,10 @@ public class IotRequestMapping {
        public static final String updateLocation= "updateLocation";
        public static final String updateLocation= "updateLocation";
        public static final String createPatientDevice = "createPatientDevice";
        public static final String createPatientDevice = "createPatientDevice";
        //设备维修
        public static final String createRepairDevice = "createRepairDevice";
        public static final String getRepairDeviceList = "getRepairDeviceList";
    }
    }

+ 20 - 0
svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotPatientDeviceController.java

@ -304,4 +304,24 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError(e.getMessage());
        }
        }
    }
    }
    @PostMapping(value = IotRequestMapping.PatientDevice.createRepairDevice)
    @ApiOperation(value = "新增设备维修记录", notes = "新增设备维修记录")
    public MixEnvelop<IotPatientDeviceVO, IotPatientDeviceVO> createRepairDevice(@ApiParam(name = "deviceSn", value = "设备sn码")
                                                                                     @RequestParam(value = "deviceSn", required = true) String deviceSn,
                                                                                 @ApiParam(name = "status", value = "维修状态(1待维护 2已报修 3厂家接收 4厂家寄回 5待更换 6已更换)")
                                                                                 @RequestParam(value = "status", required = false) Integer status,
                                                                                 @ApiParam(name = "damageDescription", value = "损坏说明")
                                                                                     @RequestParam(value = "damageDescription", required = false) String damageDescription,
                                                                                 @ApiParam(name = "damageImages", value = "申请维修附件图片,多个用逗号隔开")
                                                                                     @RequestParam(value = "damageImages", required = false) String damageImages) {
        try {
            //设备绑定
            List<IotPatientDeviceVO> patientDeviceDOList = iotPatientDeviceService.createRepairDevice(deviceSn, status, damageDescription, damageImages);
            return MixEnvelop.getSuccessList(IotRequestMapping.Device.message_success_create, patientDeviceDOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}
}

+ 13 - 0
svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@ -274,4 +274,17 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
        count = result.getTotal();
        count = result.getTotal();
        return count;
        return count;
    }
    }
    public List<IotPatientDeviceVO> createRepairDevice(String deviceSn, Integer status, String damageDescription, String damageImages) {
        List<IotPatientDeviceDO> patientDeviceDOList = iotPatientDeviceDao.findByDeviceSn(deviceSn);
        for(IotPatientDeviceDO patientDeviceDO : patientDeviceDOList){
            patientDeviceDO.setStatus(status);
            patientDeviceDO.setDamageDescription(damageDescription);
            patientDeviceDO.setDamageImages(damageImages);
            patientDeviceDO.setUpdateTime(new Date());
        }
        iotPatientDeviceDao.save(patientDeviceDOList);
        List<IotPatientDeviceVO> patientDeviceVOS = new ArrayList<>();
        return convertToModels(patientDeviceDOList, patientDeviceVOS, IotPatientDeviceVO.class);
    }
}
}