更xinjiekou ,fix bug

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -81,11 +81,11 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateAddressInfo)
    @ApiOperation(value = "设备分配投放地址")
    public Envelop updateAddressInfo(
            @ApiParam(name = "deviceId", value = "设备Id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId,
            @ApiParam(name = "deviceIds", value = "设备Id", required = true)
            @RequestParam(value = "deviceIds", required = true) String deviceIds,
            @ApiParam(name = "deliveryAddress", value = "投放地址", required = true)
            @RequestParam(value = "deliveryAddress", required = true) String deliveryAddress) throws Exception {
        String str = deviceService.updateDeviceAddress(deviceId, deliveryAddress);
        String str = deviceService.updateDeviceAddress(deviceIds, deliveryAddress);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
@@ -146,9 +146,9 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseDevice.UNBINDDEVICE)
    @ApiOperation(value = "设备解绑")
    public Envelop unbindDevice(
            @ApiParam(name = "deviceId", value = "设备Id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId) throws Exception {
        String str = deviceService.unbindDevice(deviceId);
            @ApiParam(name = "deviceIds", value = "设备Id", required = true)
            @RequestParam(value = "deviceIds", required = true) String deviceIds) throws Exception {
        String str = deviceService.unbindDevice(deviceIds);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -158,23 +158,26 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    @Transactional(rollbackFor = Exception.class)
    public String updateDeviceAddress(String deviceId, String address){
    public String updateDeviceAddress(String deviceIds, String address){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId) && StringUtils.isEmpty(address)){
            result.put("msg","deviceId and address is null");
        if(StringUtils.isEmpty(deviceIds) && StringUtils.isEmpty(address)){
            result.put("msg","deviceIds and address is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        if (mediicinedevice == null) {
            result.put("msg","device doesn't exist");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        for (String deviceId : deviceIds.split(",")) {
            if(!StringUtils.isEmpty(deviceId)){
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
                if (mediicinedevice == null) {
                    result.put("msg","device doesn't exist");
                    result.put("response", ConstantUtils.FAIL);
                    return result.toJSONString();
                }
                mediicinedevice.setDeliveryAddress(address);
                this.save(mediicinedevice);
            }
        }
        mediicinedevice.setDeliveryAddress(address);
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
@@ -235,41 +238,44 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    /**
     * 解绑设备
     * @param deviceId
     * @param deviceIds
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String unbindDevice(String deviceId){
    public String unbindDevice(String deviceIds){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId)){
            result.put("msg","deviceId is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        if (mediicinedevice == null) {
            result.put("msg","device doesn't exist");
        if(StringUtils.isEmpty(deviceIds)){
            result.put("msg","deviceIds is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        List<Map<String, Object>> list = null;
        list = hibenateUtils.createSQLQuery("SELECT * FROM t_mediicine_device_user where del = 1 AND device_id = '" + deviceId + "'");
        if (list != null && list.size() > 0) {
            for (Map<String, Object> stringObjectMap : list) {
                if (!StringUtils.isEmpty(stringObjectMap.get("id").toString())) {
                    MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
                    if (mediicineDeviceUser != null) {
                        mediicineDeviceUser.setDel("0");
                        deviceUserDao.save(mediicineDeviceUser);
        for (String deviceId : deviceIds.split(",")) {
            if(!StringUtils.isEmpty(deviceId)){
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
                if (mediicinedevice == null) {
                    result.put("msg","device doesn't exist");
                    result.put("response", ConstantUtils.FAIL);
                    return result.toJSONString();
                }
                List<Map<String, Object>> list = null;
                list = hibenateUtils.createSQLQuery("SELECT * FROM t_mediicine_device_user where del = 1 AND device_id = '" + deviceId + "'");
                if (list != null && list.size() > 0) {
                    for (Map<String, Object> stringObjectMap : list) {
                        if (!StringUtils.isEmpty(stringObjectMap.get("id").toString())) {
                            MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
                            if (mediicineDeviceUser != null) {
                                mediicineDeviceUser.setDel("0");
                                deviceUserDao.save(mediicineDeviceUser);
                            }
                        }
                    }
                }
                mediicinedevice.setBelongCommunity(null);
                mediicinedevice.setCommunity(null);
                this.save(mediicinedevice);
            }
        }
        mediicinedevice.setBelongCommunity(null);
        mediicinedevice.setCommunity(null);
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }