wangzhinan пре 3 година
родитељ
комит
5f350b409d

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

@ -14,6 +14,12 @@ import javax.persistence.Table;
public class WlyyUserEquipmentDO 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 String equipmentId;//设备id
    private String equipmentName;//设备名称
    private Integer del;//删除标识(0删除1正常)
@ -49,4 +55,52 @@ public class WlyyUserEquipmentDO extends UuidIdentityEntityWithOperator {
    public void setDel(Integer del) {
        this.del = del;
    }
    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;
    }
}

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

@ -176,6 +176,16 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/userEquipment";
    }
    /**
     * 巨米第三方接口
     */
    public static class JumiApi extends Basic {
        public static final String PREFIX  = "/jumiApi";
        public static final String getEquipmentList  = "/getEquipmentList";
        public static final String getEquipmentInfo = "/getEquipmentInfo";
    }
    /**
     * 设备管理
     */

+ 12 - 0
common/common-util/src/main/java/com/yihu/jw/util/http/HttpClientUtil.java

@ -721,4 +721,16 @@ public class HttpClientUtil {
        }
        return buffer.toString();
    }
    public String postBodyAuthorization(String url, String token) {
        RestTemplate restTemplate = new RestTemplate();
        HttpHeaders headers = new HttpHeaders();
        headers.add("Authorization", "Basic "+token);
        headers.add("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
        headers.add("Accept",MediaType.ALL_VALUE);
        String str = "grant_type=client_credentials";
        org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(str, headers);
        String ret = restTemplate.postForObject(url, formEntity, String.class);
        return ret;
    }
}

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

@ -11,7 +11,7 @@ import java.util.List;
public interface WlyyUserAreaDao extends PagingAndSortingRepository<WlyyUserAreaDO, String>, JpaSpecificationExecutor<WlyyUserAreaDO> {
    @Query("select id from WlyyUserAreaDO where userId = ?1")
    @Query("select id from WlyyUserAreaDO where userId = ?1 ")
    List<WlyyUserAreaDO> findAllByUserId(String userId);
    @Modifying

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

@ -1,5 +1,6 @@
package com.yihu.jw.base.dao.equipment;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@ -11,6 +12,9 @@ import java.util.List;
public interface WlyyUserEquipmentDao extends PagingAndSortingRepository<WlyyUserEquipmentDO, String>, JpaSpecificationExecutor<WlyyUserEquipmentDO> {
    @Modifying
    @Query("delete from WlyyUserEquipmentDO p where p.userId=?1 ")
    @Query("delete from WlyyUserEquipmentDO p where p.userId=?1 and del=1 ")
    void deleteByUserId(String userId);
    @Query("select id from WlyyUserEquipmentDO where userId = ?1 and del=1 ")
    List<WlyyUserEquipmentDO> findAllByUserId(String userId);
}

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

@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseHospital.PREFIX)
@RequestMapping(value = BaseRequestMapping.Equipment.PREFIX)
@Api(value = "社区/医院字典控制器", description = "社区/医院字典接口", tags = {"wlyy基础服务 - 社区/医院字典接口"})
public class BaseEquipmentEndpoint extends EnvelopRestEndpoint {

+ 55 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/equipment/JuMiApiEndpoint.java

@ -0,0 +1,55 @@
package com.yihu.jw.base.endpoint.equipment;
import com.yihu.jw.base.service.equipment.JuMiAiService;
import com.yihu.jw.restmodel.web.Envelop;
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.JumiApi.PREFIX)
@Api(value = "巨米api管理", description = "巨米api管理接口", tags = {"巨米api管理接口"})
public class JuMiApiEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private JuMiAiService juMiAiService;
    @PostMapping(value = BaseRequestMapping.JumiApi.getEquipmentList)
    @ApiOperation(value = "获取设备列表")
    public Envelop selectByHospitalOrTown (
            @ApiParam(name = "pageIndex", value = "当前页数", required = false)
            @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
            @ApiParam(name = "page_size", value = "每页数量", required = false)
            @RequestParam(value = "page_size", required = false) Integer page_size) throws Exception {
        String  result =  juMiAiService.getEquipmentList(pageIndex,page_size);
        Envelop envelop = new Envelop();
        envelop.setMessage(result);
        return envelop;
    }
    @PostMapping(value = BaseRequestMapping.JumiApi.getEquipmentInfo)
    @ApiOperation(value = "获取设备详情")
    public Envelop selectByHospitalOrTown (
            @ApiParam(name = "deviceNo", value = "设备编号", required = false)
            @RequestParam(value = "deviceNo", required = false) String deviceNo) throws Exception {
        String  result =  juMiAiService.getEquipmentInfo(deviceNo);
        Envelop envelop = new Envelop();
        envelop.setMessage(result);
        return envelop;
    }
}

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

@ -31,4 +31,7 @@ import java.util.Map;
public class UserEquipmentEndpoint extends EnvelopRestEndpoint {
}

Разлика између датотеке није приказан због своје велике величине
+ 188 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/equipment/JuMiAiService.java


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

@ -394,6 +394,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
                userEquipmentDO.setDel(1);
                userEquipmentDO.setUserId(userDO.getId());
                userEquipmentDO.setCity(object.getString("city"));
                userEquipmentDO.setCityName(object.getString("cityName"));
                userEquipmentDO.setTown(object.getString("town"));
                userEquipmentDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                    userEquipmentDO.setHospital(object.getString("hospital"));
                    userEquipmentDO.setHospitalName(object.getString("hospitalName"));
                }
                userEquipmentDO.setEquipmentId(object.getString("equipmentId"));
                userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
                userEquipmentDO.setCreateTime(new Date());
@ -426,6 +434,8 @@ 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", "请点击机构管理选择所在机构");
            result.put("response", ConstantUtils.FAIL);
@ -469,6 +479,53 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
        }
        //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.setCity(object.getString("city"));
                userEquipmentDO.setCityName(object.getString("cityName"));
                userEquipmentDO.setTown(object.getString("town"));
                userEquipmentDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                    userEquipmentDO.setHospital(object.getString("hospital"));
                    userEquipmentDO.setHospitalName(object.getString("hospitalName"));
                }
                userEquipmentDO.setEquipmentId(object.getString("equipmentId"));
                userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
                userEquipmentDO.setCreateTime(new Date());
                userEquipmentDO.setUpdateTime(new Date());
                userEquipmentDao.save(userEquipmentDO);
            }
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", userDO);
        return result;
@ -494,10 +551,22 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        //用户角色
        RoleDO roleDO = roleDao.findOne(user.getRoleId());
        //用户所属区域
        List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByUserId(userId);
        //用户管理的设备
        List<WlyyUserEquipmentDO> userEquipmentDOList = userEquipmentDao.findAllByUserId(userId);
        //用户关联的机构
        List<BaseOrgUserDO>  orgList = baseOrgUserService.findAllByUserId(user.getId());
        JSONObject userInfo = new JSONObject();
        userInfo.put("user",user);
        userInfo.put("role",roleDO);
        userInfo.put("userArea",userAreaDOList);
        userInfo.put("userEquipment",userEquipmentDOList);
        userInfo.put("org",orgList);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",userInfo);