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

@@ -19,16 +19,15 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jxl.Workbook;
import jxl.write.Label;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import jxl.write.WriteException;
import jxl.format.Alignment;
import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
@@ -173,8 +172,8 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
        }
    }
    private void write(OutputStream os, List<Mediicinedrugs> list) throws Exception {
        WritableWorkbook wwb = Workbook.createWorkbook(os);
    private void write(OutputStream os, List<Map<String,Object>> list) throws Exception {
        WritableWorkbook wwb = jxl.Workbook.createWorkbook(os);
        try {
            WritableSheet sheet = wwb.createSheet("sheet", 1);
            String header[] = {"图片", "药品名称/药品条码", "分类", "剂型", "类型", "单位", "售价", "库存", "销量", "自编码", "规格", "厂家", "批准文号", "品牌", "状态"};
@@ -185,35 +184,40 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            }
            int j = 1;
            int ii=1;
            for (Mediicinedrugs tmp : list) {
            for (Map<String,Object> tmp : list) {
                addCell(sheet, j, 0, ii + "img");
                addCell(sheet, j, 1, tmp.getDrugNameAlies() +"/" + tmp.getDrugBarCode());
                addCell(sheet, j, 2, tmp.getDrugTypeCode());
                addCell(sheet, j, 3, tmp.getDosForm() + "");
                addCell(sheet, j, 4, tmp.getDrugTypeCode()+"");
                addCell(sheet, j, 5, tmp.getUnit() + "");
                addCell(sheet, j, 6, tmp.getPrice() + "");
                addCell(sheet, j, 7, tmp.getInventory() + "");
                addCell(sheet, j, 8, tmp.getSaleVolume() + "");
                addCell(sheet, j, 9, tmp.getSelfCode() + "");
                addCell(sheet, j, 10, tmp.getSpecif() + "");
                addCell(sheet, j, 11, tmp.getManufactor() + "");
                addCell(sheet, j, 12, tmp.getApprovalNum() + "");
                addCell(sheet, j, 13, tmp.getBrand() + "");
                addCell(sheet, j, 14, tmp.getState() + "");
                addCell(sheet, j, 1, tmp.get("drugNameAlies") +"/" + tmp.get("drugBarCode"));
                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++;
            }
            wwb.write();
            wwb.close();
        } catch (Exception e) {
        } catch (IOException e) {
            e.printStackTrace();
            if (wwb != null) wwb.close();
            throw e;
        }
    }
    private void addCell(WritableSheet ws, int row, int column, String data) throws WriteException {
        Label label = new Label(column, row, data);
        WritableCellFormat cellFormat=new WritableCellFormat();
        cellFormat.setAlignment(Alignment.CENTRE);
        cellFormat.setVerticalAlignment(VerticalAlignment.CENTRE);
        label.setCellFormat(cellFormat);
        ws.addCell(label);
    }

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/a3service/MedicineDrugsService.java

@@ -15,7 +15,6 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.utils.hibernate.HibenateUtils;
@@ -294,117 +293,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        return result;
    }
    public MixEnvelop  queryDrugListFullInfo2(String state, String content, String drugClass,
                                              String drugType, String lowVolume, String heightVolume,
                                              String lowPrice, String heightPrice, int page, int size,String wechatId) {
        String sql ="";
        {
            sql += "SELECT\n" +
                    "    t.id as id,\n" +
                    "    t.approval_num as approvalNum,\n" +
                    "    t.barcode as barcode,\n" +
                    "    t.brand as brand,\n" +
                    "    t.dos_form as dosForm,\n" +
                    "    t.state as state,\n" +
                    "    t.drug_bar_code as drugBarCode,\n" +
                    "    t.drug_class as drugClass,\n" +
                    "    t.drug_class_code as drugClassCode,\n" +
                    "    t.drug_code as drugCode,\n" +
                    "    t.drug_name as drugName,\n" +
                    "    t.drug_name_alies as drugNameAlies,\n" +
                    "    t.drug_short_code as drugShortCode,\n" +
                    "    t.drug_type_code as drugTypeCode,\n" +
                    "    t.earlywarningcate as earlywarningcate,\n" +
                    "    t.inventory as inventory,\n" +
                    "    t.manufactor as manufactor,\n" +
                    "    t.med_cabinet as medCabinet,\n" +
                    "    t.pic as pic,\n" +
                    "    t.price as price,\n" +
                    "    t.sale_volume as saleVolume,\n" +
                    "    t.self_code as selfCode,\n" +
                    "    t.specif as specif,\n" +
                    "    t.unit as unit,\n" +
                    "    t.create_time as createTime,\n" +
                    "    t.create_user as createUser,\n" +
                    "    t.create_user_name as createUserName,\n" +
                    "    t.update_time as updateTime,\n" +
                    "    t.update_user as updateUser,\n" +
                    "    t.update_user_name as updateUserName,\n" +
                    "    t.drug_sku as drugSku,\n" +
                    "    t.drug_num as drugNum,\n" +
                    "    t.use_num as useNum,\n" +
                    "    t.use_way as useWay,\n" +
                    "    t.use_rate as useRate,\n" +
                    "    t.use_dose as useDose,\n" +
                    "    t.use_way_add as useWayAdd,\n" +
                    "    t.org_code as orgCode,\n" +
                    "    t.org_name as orgName,\n" +
                    "    t.quantity_unit as quantityUnit,\n" +
                    "    t.pack_unit as packUnit\n" +
                    "FROM\n" +
                    "    t_mediicine_drugs AS t where 1=1";
        }
        String conditionSql = "";
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = '" + state + "'";
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.drug_code, t.drug_bar_code, drug_name, t.drug_short_code) like '%"+content+"%'";
        }
        if (!StringUtils.isEmpty(drugClass)){
            conditionSql += " and t.drug_class_code = '" + drugClass + "'";
        }
        if (!StringUtils.isEmpty(drugType)){
            conditionSql += " and t.drug_type_code = '" + drugType + "'";
        }
        if (!StringUtils.isEmpty(lowVolume)){
            conditionSql += " and t.sale_volume >= " + lowVolume;
        }
        if (!StringUtils.isEmpty(heightVolume)) {
            conditionSql += " and t.sale_volume <= " + heightVolume;
        }
        if (!StringUtils.isEmpty(lowPrice)){
            conditionSql += " and t.price >= " + lowPrice;
        }
        if (!StringUtils.isEmpty(heightPrice)) {
            conditionSql += " and t.price <= " + heightPrice;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_drugs t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> stringObjectMap:list){
            if (stringObjectMap.get("state") != null) {
                if (!StringUtils.isEmpty(stringObjectMap.get("state").toString())) {
                    if ("1".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "已上架");
                    }
                    if ("2".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "已下架");
                    }
                    if ("3".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "处方");
                    }
                    if ("4".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "非处方");
                    }
                }
            }
        }
        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success, list);
    }
    public void pushListWrite(OutputStream os, List<Map<String, Object>> ls) throws Exception {
        WritableWorkbook wwb = jxl.Workbook.createWorkbook(os);
@@ -490,7 +379,122 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
    }
    public void getOrgPhysicDict(String jsonData) {
    public MixEnvelop queryDrugListFullInfo2(String state, String content, String drugClass,
                                            String drugType, String lowVolume, String heightVolume,
                                            String lowPrice, String heightPrice, int page, int size, String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        /*String orgCodeVale = null == orgCode ? "" : orgCode;
        String del = null == docStatus ? "" : docStatus;
        String nameOrIdcardValue = null == nameOrIdcard ? "" : "%" + nameOrIdcard + "%";
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;*/
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.approval_num as approvalNum,\n" +
                "    t.barcode as barcode,\n" +
                "    t.brand as brand,\n" +
                "    t.dos_form as dosForm,\n" +
                "    t.state as state,\n" +
                "    t.drug_bar_code as drugBarCode,\n" +
                "    t.drug_class as drugClass,\n" +
                "    t.drug_class_code as drugClassCode,\n" +
                "    t.drug_code as drugCode,\n" +
                "    t.drug_name as drugName,\n" +
                "    t.drug_name_alies as drugNameAlies,\n" +
                "    t.drug_short_code as drugShortCode,\n" +
                "    t.drug_type_code as drugTypeCode,\n" +
                "    t.earlywarningcate as earlywarningcate,\n" +
                "    t.inventory as inventory,\n" +
                "    t.manufactor as manufactor,\n" +
                "    t.med_cabinet as medCabinet,\n" +
                "    t.pic as pic,\n" +
                "    t.price as price,\n" +
                "    t.sale_volume as saleVolume,\n" +
                "    t.self_code as selfCode,\n" +
                "    t.specif as specif,\n" +
                "    t.unit as unit,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.drug_sku as drugSku,\n" +
                "    t.drug_num as drugNum,\n" +
                "    t.use_num as useNum,\n" +
                "    t.use_way as useWay,\n" +
                "    t.use_rate as useRate,\n" +
                "    t.use_dose as useDose,\n" +
                "    t.use_way_add as useWayAdd,\n" +
                "    t.org_code as orgCode,\n" +
                "    t.org_name as orgName,\n" +
                "    t.quantity_unit as quantityUnit,\n" +
                "    t.pack_unit as packUnit\n" +
                "FROM\n" +
                "    t_mediicine_drugs AS t where 1=1";
        String conditionSql = "";
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = '" + state + "'";
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.drug_code, t.drug_bar_code, drug_name, t.drug_short_code) like '%"+content+"%'";
        }
        if (!StringUtils.isEmpty(drugClass)){
            conditionSql += " and t.drug_class_code = '" + drugClass + "'";
        }
        if (!StringUtils.isEmpty(drugType)){
            conditionSql += " and t.drug_type_code = '" + drugType + "'";
        }
        if (!StringUtils.isEmpty(lowVolume)){
            conditionSql += " and t.sale_volume >= " + lowVolume;
        }
        if (!StringUtils.isEmpty(heightVolume)) {
            conditionSql += " and t.sale_volume <= " + heightVolume;
        }
        if (!StringUtils.isEmpty(lowPrice)){
            conditionSql += " and t.price >= " + lowPrice;
        }
        if (!StringUtils.isEmpty(heightPrice)) {
            conditionSql += " and t.price <= " + heightPrice;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_drugs t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> stringObjectMap:list){
            if (stringObjectMap.get("state") != null) {
                if (!StringUtils.isEmpty(stringObjectMap.get("state").toString())) {
                    if ("1".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "已上架");
                    }
                    if ("2".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "已下架");
                    }
                    if ("3".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "处方");
                    }
                    if ("4".equals(stringObjectMap.get("state").toString())) {
                        stringObjectMap.put("stateName", "非处方");
                    }
                }
            }
        }
        Map<String,Object> map=new HashMap<>();
        map.put("count",count);
        list.add(map);
//        result.put("count", count);
//        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,list);
    }
}

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;