【疫情防控代码】

business/base-service/src/main/java/com/yihu/jw/hospital/HospitalDao.java

@@ -15,6 +15,8 @@ import java.util.List;
public interface HospitalDao extends PagingAndSortingRepository<DmHospitalDO, Integer>, JpaSpecificationExecutor<DmHospitalDO> {
    @Query("from DmHospitalDO t where t.town=?1 and t.del='1'")
    List<DmHospitalDO> findByTownCode(String town, Pageable pageRequest);
    @Query("from DmHospitalDO t where t.town=?1 and t.name like ?2 and t.del='1'")
    List<DmHospitalDO> findByTownCodeAndName(String town,String name,Pageable pageRequest);
    @Query("from DmHospitalDO t where t.code=?1 and t.del='1'")
    DmHospitalDO findByCode(String code);

business/base-service/src/main/java/com/yihu/jw/hospital/team/service/WlyyAdminTeamService.java

@@ -38,11 +38,15 @@ public class WlyyAdminTeamService {
    @Autowired
    private BaseTownDao baseTownDao;
    //查询机构
    public MixEnvelop findHospitalByTown(String townCode,Integer page,Integer pageSize){
    public MixEnvelop findHospitalByTown(String townCode,String name,Integer page,Integer pageSize){
        PageRequest pageRequest = new PageRequest(page-1,pageSize);
        MixEnvelop mixEnvelop = new MixEnvelop();
        List<DmHospitalDO> list =null;
        list = hospitalDao.findByTownCode(townCode,pageRequest);
        if (StringUtils.isNoneBlank(name)){
            list=hospitalDao.findByTownCodeAndName(townCode,name,pageRequest);
        }else {
            list = hospitalDao.findByTownCode(townCode,pageRequest);
        }
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setDetailModelList(list);

common/common-entity/src/main/java/com/yihu/jw/entity/equipment/BaseHospitalEquipmentDO.java

@@ -0,0 +1,127 @@
package com.yihu.jw.entity.equipment;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by wangzhinan on 2021/09/16.
 * 设备表
 */
@Entity
@Table(name = "base_hospital_equipment")
public class BaseHospitalEquipmentDO extends UuidIdentityEntityWithOperator {
    private String name;//设备名称
    private String code;//设备编码
    private String networkStatus;//设备状态（1在线、0离线）
    private String sellingStatus;//售卖状态（1、在售，2、闲置，3、故障）
    private String type;//设备分类code;
    private String typeName;//设备分类名称
    private String info;//设备信号强度
    private String hospital;//医院code
    private String hospitalName;//所属医院名称
    private Integer bindingStatus;//绑定状态（1、解绑、2、绑定）
    private Integer status;//设备上架状态（1、上架，2、下架）
    private String address;//分配地址
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getNetworkStatus() {
        return networkStatus;
    }
    public void setNetworkStatus(String networkStatus) {
        this.networkStatus = networkStatus;
    }
    public String getSellingStatus() {
        return sellingStatus;
    }
    public void setSellingStatus(String sellingStatus) {
        this.sellingStatus = sellingStatus;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public Integer getBindingStatus() {
        return bindingStatus;
    }
    public void setBindingStatus(Integer bindingStatus) {
        this.bindingStatus = bindingStatus;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/equipment/WlyyUserAreaDO.java

@@ -0,0 +1,88 @@
package com.yihu.jw.entity.equipment;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wangzhinan on 2021/09/16.
 * 用户所属区域
 */
@Entity
@Table(name = "wlyy_user_area")
public class WlyyUserAreaDO extends UuidIdentityEntityWithOperator {
    private String userId;//用户id
    private String city;//城市code
    private String cityName;//城市名称
    private String town;//区域code
    private String townName;//区域名称
    private String hospital;//医院或者社区code
    private String hospitalName;//医院或者社区名称
    private Integer del;//删除标识（0删除1正常）
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/equipment/WlyyUserEquipmentDO.java

@@ -0,0 +1,52 @@
package com.yihu.jw.entity.equipment;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wangzhinan on 2021/09/16.
 * 用户管理的设备
 */
@Entity
@Table(name = "wlyy_user_equipment")
public class WlyyUserEquipmentDO extends UuidIdentityEntityWithOperator {
    private String userId;//用户id
    private String equipmentId;//设备id
    private String equipmentName;//设备名称
    private Integer del;//删除标识（0删除1正常）
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getEquipmentId() {
        return equipmentId;
    }
    public void setEquipmentId(String equipmentId) {
        this.equipmentId = equipmentId;
    }
    public String getEquipmentName() {
        return equipmentName;
    }
    public void setEquipmentName(String equipmentName) {
        this.equipmentName = equipmentName;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -169,6 +169,21 @@ public class BaseRequestMapping {
        public static final String orgChoiceInfo = "/orgChoiceInfo";
    }
    /**
     * 用户设备管理
     */
    public static class UserEquipment extends Basic {
        public static final String PREFIX  = "/userEquipment";
    }
    /**
     * 设备管理
     */
    public static class Equipment extends Basic {
        public static final String PREFIX  = "/equipment";
        public static final String selectByHospitalOrTown  = "/selectByHospitalOrTown";
    }
    /**
     * 用户角色
     */
@@ -689,6 +704,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/baseTown";
    }
    /**
     * 区县字典
     */
    public static class BaseHospital extends Basic {
        public static final String PREFIX  = "/BaseHospital";
    }
    /**
     * 健康问题字典

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/BaseHospitalEquipmentDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.base.dao.equipment;
import com.yihu.jw.entity.equipment.BaseHospitalEquipmentDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseHospitalEquipmentDao extends PagingAndSortingRepository<BaseHospitalEquipmentDO, String>, JpaSpecificationExecutor<BaseHospitalEquipmentDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserAreaDao.java

@@ -0,0 +1,20 @@
package com.yihu.jw.base.dao.equipment;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface WlyyUserAreaDao extends PagingAndSortingRepository<WlyyUserAreaDO, String>, JpaSpecificationExecutor<WlyyUserAreaDO> {
    @Query("select id from WlyyUserAreaDO where userId = ?1")
    List<WlyyUserAreaDO> findAllByUserId(String userId);
    @Modifying
    @Query("delete from WlyyUserAreaDO p where p.userId=?1 ")
    void deleteByUserId(String userId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserEquipmentDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.base.dao.equipment;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface WlyyUserEquipmentDao extends PagingAndSortingRepository<WlyyUserEquipmentDO, String>, JpaSpecificationExecutor<WlyyUserEquipmentDO> {
    @Modifying
    @Query("delete from WlyyUserEquipmentDO p where p.userId=?1 ")
    void deleteByUserId(String userId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseEquipmentEndpoint.java

@@ -0,0 +1,55 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.hospital.team.service.WlyyAdminTeamService;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
*
* 社区/医院字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseHospital.PREFIX)
@Api(value = "社区/医院字典控制器", description = "社区/医院字典接口", tags = {"wlyy基础服务 - 社区/医院字典接口"})
public class BaseEquipmentEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAdminTeamService wlyyAdminTeamService;
    @ApiOperation("查询社区")
    @GetMapping("/findOrgList")
    public MixEnvelop findOrgList(@ApiParam(name = "code", value = "区code", required = false)
                                  @RequestParam(value = "code", required = false)String code,
                                  @ApiParam(name = "name", value = "社区名称", required = false)
                                  @RequestParam(value = "name", required = false)String name,
                                  @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                                  @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                                  @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
                                  @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
        try {
            return wlyyAdminTeamService.findHospitalByTown(code,name,page,pageSize);
        }catch (Exception e){
            System.out.println(e.getClass());
            return failedMixEnvelopException(e);
        }
    }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseHospitalEndpoint.java

@@ -0,0 +1,58 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.area.service.BaseTownService;
import com.yihu.jw.entity.base.area.BaseTownDO;
import com.yihu.jw.hospital.team.service.WlyyAdminTeamService;
import com.yihu.jw.restmodel.base.area.BaseTownVO;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 社区/医院字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseHospital.PREFIX)
@Api(value = "社区/医院字典控制器", description = "社区/医院字典接口", tags = {"wlyy基础服务 - 社区/医院字典接口"})
public class BaseHospitalEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAdminTeamService wlyyAdminTeamService;
    @ApiOperation("查询社区")
    @GetMapping("/findOrgList")
    public MixEnvelop findOrgList(@ApiParam(name = "code", value = "区code", required = false)
                                  @RequestParam(value = "code", required = false)String code,
                                  @ApiParam(name = "name", value = "社区名称", required = false)
                                  @RequestParam(value = "name", required = false)String name,
                                  @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                                  @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                                  @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
                                  @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
        try {
            return wlyyAdminTeamService.findHospitalByTown(code,name,page,pageSize);
        }catch (Exception e){
            System.out.println(e.getClass());
            return failedMixEnvelopException(e);
        }
    }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/equipment/EquipmentEndpoint.java

@@ -0,0 +1,49 @@
package com.yihu.jw.base.endpoint.equipment;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.equipment.BaseHospitalEquipmentService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
 * Created by wangzhinan on 2021/09/16.
 * 设备管理
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Equipment.PREFIX)
@Api(value = "设备管理", description = "设备管理接口", tags = {"设备管理接口"})
public class EquipmentEndpoint extends EnvelopRestEndpoint {
    @Autowired
    public BaseHospitalEquipmentService hospitalEquipmentService;
    @PostMapping(value = BaseRequestMapping.Equipment.selectByHospitalOrTown)
    @ApiOperation(value = "根据医院code/区域code查找设备")
    public ListEnvelop selectByHospitalOrTown (
            @ApiParam(name = "town", value = "区code", required = false)
            @RequestParam(value = "town", required = false) String town,
            @ApiParam(name = "hospital", value = "医院code或者区域code", required = false)
            @RequestParam(value = "hospital", required = false) String hospital,
            @ApiParam(name = "name", value = "设备名称", required = false)
            @RequestParam(value = "name", required = false) String name) throws Exception {
        List<Map<String,Object>> mapList =  hospitalEquipmentService.selectByHospitalOrTown(town,hospital,name);
        ListEnvelop listEnvelop = new ListEnvelop();
        listEnvelop.setDetailModelList(mapList);
        return listEnvelop;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/equipment/UserEquipmentEndpoint.java

@@ -0,0 +1,34 @@
package com.yihu.jw.base.endpoint.equipment;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.base.user.UserVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * Created by wangzhinan on 2021/09/16.
 * 设备管理
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserEquipment.PREFIX)
@Api(value = "用户设备管理", description = "用户设备管理接口", tags = {"用户设备管理接口"})
public class UserEquipmentEndpoint extends EnvelopRestEndpoint {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/equipment/BaseHospitalEquipmentService.java

@@ -0,0 +1,64 @@
package com.yihu.jw.base.service.equipment;
import com.yihu.jw.base.dao.equipment.BaseHospitalEquipmentDao;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.entity.equipment.BaseHospitalEquipmentDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
 * Created by wangzhinan on 2021/09/16.
 * 设备管理
 */
@Service
public class BaseHospitalEquipmentService extends BaseJpaService<BaseHospitalEquipmentDO, BaseHospitalEquipmentDao> {
    @Autowired
    private BaseHospitalEquipmentDao baseHospitalEquipmentDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public List<Map<String,Object>> selectByHospitalOrTown(String town,String hospital,String name){
        String sql ="SELECT\n" +
                "\tid AS \"id\",\n" +
                "\tCODE AS \"code\",\n" +
                "\tNAME AS \"name\",\n" +
                "\tnetwork_status AS \"networkStatus\",\n" +
                "\tselling_status AS \"sellingStatus\",\n" +
                "\ttype as \"type\",\n" +
                "\ttype_name as \"typeName\",\n" +
                "\tinfo as \"info\",\n" +
                "\thospital as \"hospital\",\n" +
                "\thospital_name as \"hospitalName\",\n" +
                "\tbinding_status as \"bindingStatus\",\n" +
                "\tstatus as \"status\",\n" +
                "\taddress as \"address\"\n" +
                "FROM\n" +
                "\tbase_hospital_equipment\n" +
                "WHERE\n" +
                "\t1 = 1 ";
        if (town!=null&&town!=""){
            sql +=" and hospital IN(select * from dm_hospital dm where dm.town ='"+town+"') ";
        }
        if (hospital!=null&&hospital!=""){
            sql +=" and hospital ='"+hospital+"' ";
        }
        if (name!=null&&name!=""){
            sql +=" and name like'%"+hospital+"%' ";
        }
        List<Map<String,Object>> map = jdbcTemplate.queryForList(sql);
        return map;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/equipment/WlyyUserAreaService.java

@@ -0,0 +1,23 @@
package com.yihu.jw.base.service.equipment;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
/**
 * Created by wangzhinan on 2021/09/16.
 * 用户所属区域
 */
@Service
public class WlyyUserAreaService extends BaseJpaService<WlyyUserAreaDO, WlyyUserAreaDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/equipment/WlyyUserEquipmentService.java

@@ -0,0 +1,17 @@
package com.yihu.jw.base.service.equipment;
import com.yihu.jw.base.dao.equipment.WlyyUserEquipmentDao;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by wangzhinan on 2021/09/16.
 * 用户管理的设备
 */
@Service
public class WlyyUserEquipmentService extends BaseJpaService<WlyyUserEquipmentDO, WlyyUserEquipmentDao> {
}

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.base.dao.equipment.WlyyUserEquipmentDao;
import com.yihu.jw.base.dao.role.BaseRoleMenuDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
@@ -15,6 +17,8 @@ import com.yihu.jw.entity.base.org.BaseOrgUserDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.base.wx.WxGraphicMessageVO;
@@ -68,7 +72,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    private OrgTreeService orgTreeService;
    @Autowired
    private BaseOrgSaasService baseOrgSaasService;
    private WlyyUserAreaDao userAreaDao;
    @Autowired
    private WlyyUserEquipmentDao userEquipmentDao;
    
    @Autowired
    private StringRedisTemplate redisTemplate;
@@ -320,6 +326,9 @@ 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");
        //归属租户为默认租户，表示用户为超级管理员，不需要机构
        if (null == user || CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
            result.put("msg", "请点击机构管理选择所在机构");
@@ -354,6 +363,44 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
            baseOrgUserService.batchInsert(orgList);
        }
        //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
        //用户所属区域添加
        if (area!=null&&area.size()!=0){
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<area.size();i++){
                JSONObject object = area.getJSONObject(i);
                WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
                userAreaDO.setUserId(userDO.getId());
                userAreaDO.setCity(object.getString("city"));
                userAreaDO.setCityName(object.getString("cityName"));
                userAreaDO.setTown(object.getString("town"));
                userAreaDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                    userAreaDO.setHospital(object.getString("hospital"));
                    userAreaDO.setHospitalName(object.getString("hospitalName"));
                }
                userAreaDO.setCreateTime(new Date());
                userAreaDO.setUpdateTime(new Date());
                userAreaDO.setDel(1);
                userAreaDao.save(userAreaDO);
            }
        }
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        if (equipment!=null&&equipment.size()!=0){
            userEquipmentDao.deleteByUserId(userDO.getId());
            for (int i=0;i<equipment.size();i++){
                JSONObject object = equipment.getJSONObject(i);
                WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
                userEquipmentDO.setDel(1);
                userEquipmentDO.setUserId(userDO.getId());
                userEquipmentDO.setEquipmentId(object.getString("equipmentId"));
                userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
                userEquipmentDO.setCreateTime(new Date());
                userEquipmentDO.setUpdateTime(new Date());
                userEquipmentDao.save(userEquipmentDO);
            }
        }
        JSONObject returnMsg = new JSONObject();
        returnMsg.put("username",userDO.getUsername());
        returnMsg.put("password",userDO.getIdcard().substring(userDO.getIdcard().length()-6,userDO.getIdcard().length()));

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/WlyyAdminTeamController.java

@@ -27,6 +27,8 @@ public class WlyyAdminTeamController extends EnvelopRestEndpoint {
    @GetMapping("/findOrgList")
    public MixEnvelop findOrgList(@ApiParam(name = "code", value = "code", required = false)
                                           @RequestParam(value = "code", required = false)String code,
                                  @ApiParam(name = "name", value = "name", required = false)
                                        @RequestParam(value = "name", required = false)String name,
                                           @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                                           @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                                           @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
@@ -34,7 +36,7 @@ public class WlyyAdminTeamController extends EnvelopRestEndpoint {
        try {
            return wlyyAdminTeamService.findHospitalByTown(code,page,pageSize);
            return wlyyAdminTeamService.findHospitalByTown(code,name,page,pageSize);
        }catch (Exception e){
            System.out.println(e.getClass());
            return failedMixEnvelopException(e);