人员新增多加返回字段

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

@@ -149,8 +149,8 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
        try {
            MixEnvelop result = drugsService.queryDrugListFullInfo2(state, content, drugClass, drugType, lowVolume, heightVolume, lowPrice, heightPrice,1,10000,wechatId);
            List<Map<String,Object>> list=result.getDetailModelList();
            response.setContentType("application/octet-stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("volunteerInfo.xls"));
            response.setContentType("octetstream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("volunteerInfo.xls".getBytes("UTF-8"),"ISO8859-1"));
            OutputStream os = response.getOutputStream();
            this.write(os, list);
        } catch (Exception ex) {
@@ -173,19 +173,19 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            for (Map<String,Object> tmp : list) {
                addCell(sheet, j, 0, ii + "img");
                addCell(sheet, j, 1, tmp.get("drugNameAlies") +"/" + tmp.get("drugBarCode"));
                addCell(sheet, j, 2, tmp.get("drugTypeCode")+"");
                addCell(sheet, j, 3, tmp.get("dosForm") + "");
                addCell(sheet, j, 4, tmp.get("drugTypeCode")+"");
                addCell(sheet, j, 5, tmp.get("unit") + "");
                addCell(sheet, j, 6, tmp.get("price") + "");
                addCell(sheet, j, 7, tmp.get("inventory") + "");
                addCell(sheet, j, 8, tmp.get("saleVolume") + "");
                addCell(sheet, j, 9, tmp.get("selfCode") + "");
                addCell(sheet, j, 10, tmp.get("specif") + "");
                addCell(sheet, j, 11, tmp.get("manufactor") + "");
                addCell(sheet, j, 12, tmp.get("approvalNum") + "");
                addCell(sheet, j, 13, tmp.get("brand") + "");
                addCell(sheet, j, 14, tmp.get("state") + "");
                addCell(sheet, j, 2, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 3, tmp.get("dosForm")==null?"":new String(tmp.get("dosForm").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 4, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 5, tmp.get("unit")==null?"":new String(tmp.get("unit").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 6, tmp.get("price")==null?"":new String(tmp.get("price").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 7, tmp.get("inventory")==null?"":new String(tmp.get("inventory").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 8, tmp.get("saleVolume")==null?"":new String(tmp.get("saleVolume").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 9, tmp.get("selfCode")==null?"":new String(tmp.get("selfCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 10, tmp.get("specif") == null?"":new String(tmp.get("specif").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 11, tmp.get("manufactor") ==null? "":new String(tmp.get("manufactor").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 12, tmp.get("approvalNum") ==null? "":new String(tmp.get("approvalNum").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 13, tmp.get("brand") ==null? "":new String(tmp.get("brand").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 14, tmp.get("state") ==null? "":new String(tmp.get("state").toString().getBytes("UTF-8"),"ISO8859-1"));
                j++;
                ii++;
            }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -47,7 +47,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
        return success(jsonObject);
    }
    @PostMapping(value = BaseRequestMapping.User.DELETE)
@@ -69,7 +69,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
        return success(jsonObject);
    }
    @GetMapping(value = BaseRequestMapping.User.PAGE)

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -352,7 +352,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }else {
            userDO = registerWithIdcard(userDO);
        }
        result.put("user",userDO);
        //组装用户与机构的关联关系
//        List<BaseOrgUserDO> orgList = new ArrayList<>();
//        BaseOrgUserDO orgUserDO = null;
@@ -372,6 +372,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
//        }
        //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
        //用户所属区域添加
        List<WlyyUserAreaDO> list=new ArrayList<>();
        if (area!=null&&area.size()!=0){
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<area.size();i++){
@@ -389,11 +390,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userAreaDO.setCreateTime(new Date());
                userAreaDO.setUpdateTime(new Date());
                userAreaDO.setDel(1);
                userAreaDao.save(userAreaDO);
                userAreaDO=userAreaDao.save(userAreaDO);
                list.add(userAreaDO);
            }
        }
        result.put("area",list);
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        List<WlyyUserEquipmentDO> equipmentDOS=new ArrayList<>();
        if (equipment!=null&&equipment.size()!=0){
            userEquipmentDao.deleteByUserId(userDO.getId());
            for (int i=0;i<equipment.size();i++){
@@ -413,9 +417,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
                userEquipmentDO.setCreateTime(new Date());
                userEquipmentDO.setUpdateTime(new Date());
                userEquipmentDao.save(userEquipmentDO);
                userEquipmentDO=userEquipmentDao.save(userEquipmentDO);
                equipmentDOS.add(userEquipmentDO);
            }
        }
        result.put("equipment",equipmentDOS);
        JSONObject returnMsg = new JSONObject();
        returnMsg.put("username",userDO.getUsername());
        if (!StringUtils.isNoneBlank(userDO.getIdcard())){
@@ -444,54 +450,57 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject user = jsonObject.getJSONObject("user");
        JSONArray org = jsonObject.getJSONArray("org");
        JSONArray area = jsonObject.getJSONArray("area");
        JSONArray equipment = jsonObject.getJSONArray("equipment");
 //       JSONArray org = jsonObject.getJSONArray("org");
        JSONArray area = user.getJSONArray("area");
        JSONArray equipment = user.getJSONArray("equipment");
       /* if (null == user ||  CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
            result.put("msg", "请点击机构管理选择所在机构");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }*/
        //修改用户信息
        UserDO userDO = null;
        UserDO userDO = new UserDO();
        try {
            userDO = objectMapper.readValue(user.toJSONString(), UserDO.class);
            userDO = EntityUtils.jsonToEntity(user.toString(),UserDO.class);
            UserDO oldUser = userDao.findOne(userDO.getId());
            userDO.setPassword(oldUser.getPassword());
            userDO.setSalt(randomInt(5));
            userDO.setUpdateTime(new Date());
        } catch (IOException e) {
        } catch (Exception e) {
            result.put("msg", "convert user jsonObject to UserDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        this.save(userDO);
        if (!CollectionUtils.isEmpty(org)) {
            //修改用户机构关联关系
            Set<Object> roleIdList = baseOrgUserService.findIdListByUserId(userDO.getId());
            BaseOrgUserDO orgUserDO = null;
            try {
                for (Object obj : org) {
                    orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
                    orgUserDO.setUserId(userDO.getId());
                    if (roleIdList.contains(orgUserDO.getId())) {
                        roleIdList.remove(orgUserDO.getId());
                    }
                    baseOrgUserService.save(orgUserDO);
                }
            } catch (IOException e) {
                result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
                result.put("response", ConstantUtils.FAIL);
                return result;
            }
            // 表示没有删除，只有修改
            if (roleIdList.size() > 0) {
                baseOrgUserService.delete(roleIdList.toArray());
            }
        }
        userDO=this.save(userDO);
        result.put("user",userDO);
//        if (!CollectionUtils.isEmpty(org)) {
//            //修改用户机构关联关系
//            Set<Object> roleIdList = baseOrgUserService.findIdListByUserId(userDO.getId());
//            BaseOrgUserDO orgUserDO = null;
//            try {
//                for (Object obj : org) {
//                    orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
//                    orgUserDO.setUserId(userDO.getId());
//                    if (roleIdList.contains(orgUserDO.getId())) {
//                        roleIdList.remove(orgUserDO.getId());
//                    }
//                    baseOrgUserService.save(orgUserDO);
//                }
//            } catch (IOException e) {
//                result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
//                result.put("response", ConstantUtils.FAIL);
//                return result;
//            }
//            // 表示没有删除，只有修改
//            if (roleIdList.size() > 0) {
//                baseOrgUserService.delete(roleIdList.toArray());
//            }
//        }
        //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
        //用户所属区域添加
        List<WlyyUserAreaDO> list=new ArrayList<>();
        if (area!=null&&area.size()!=0){
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<area.size();i++){
@@ -509,11 +518,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userAreaDO.setCreateTime(new Date());
                userAreaDO.setUpdateTime(new Date());
                userAreaDO.setDel(1);
                userAreaDao.save(userAreaDO);
                userAreaDO=userAreaDao.save(userAreaDO);
                list.add(userAreaDO);
            }
        }
        result.put("area",list);
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        List<WlyyUserEquipmentDO> equipmentDOS=new ArrayList<>();
        if (equipment!=null&&equipment.size()!=0){
            userEquipmentDao.deleteByUserId(userDO.getId());
            for (int i=0;i<equipment.size();i++){
@@ -533,10 +545,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
                userEquipmentDO.setCreateTime(new Date());
                userEquipmentDO.setUpdateTime(new Date());
                userEquipmentDao.save(userEquipmentDO);
                userEquipmentDO=userEquipmentDao.save(userEquipmentDO);
                equipmentDOS.add(userEquipmentDO);
            }
        }
        result.put("equipment",equipmentDOS);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", userDO);
        return result;