Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/sql记录

@@ -1430,4 +1430,7 @@ CREATE TABLE `device_data_push_log` (
  `data` varchar(1000) DEFAULT NULL,
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=449 DEFAULT CHARSET=utf8mb4 COMMENT='设备项目推送数据日志';
) ENGINE=InnoDB AUTO_INCREMENT=449 DEFAULT CHARSET=utf8mb4 COMMENT='设备项目推送数据日志';
--2021-09-07
alter table base_patient modify column archive_type  tinyint(2) DEFAULT NULL COMMENT '档案类型 1老人 2新生儿';

common/common-entity/src/main/java/com/yihu/jw/entity/base/searchClient/BaseSearchNoveltyRepeatDO.java

@@ -0,0 +1,157 @@
package com.yihu.jw.entity.base.searchClient;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by wsy on 2021/9/4.
 */
@Entity
@Table(name = "base_search_novelty_repeat")
@JsonIgnoreProperties(value = { "hibernateLazyInitializer", "handler" })
public class BaseSearchNoveltyRepeatDO extends UuidIdentityEntityWithOperator {
    private String Name;         //委托人
    private String Phone;        //联系电话
    private String Email;        //联系邮箱
    private String Address;      //联系地址
    private String subject;             //申请主题
    private String mechanism;           //机构
    private String content;             //申请内容
    private String file;            //文件
    private Integer status;              //状态码
    private String number;              //委托单号
    //private String createTime;            //生成时间
    private String reversion;                 //答复
   /* private String update_time;           //更新时间
    private String update_user_name;      //更新用户*/
    private String statusName;            //状态名称
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
/*  public String getUpdate_time() {
        return update_time;
    }
    public void setUpdate_time(String update_time) {
        this.update_time = update_time;
    }
    public String getUpdate_user_name() {
        return update_user_name;
    }
    public void setUpdate_user_name(String update_user_name) {
        this.update_user_name = update_user_name;
    }
*/
    public String getReversion() {
        return reversion;
    }
    public void setReversion(String reversion) {
        this.reversion = reversion;
    }
    /*public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }*/
    public String getName() {
        return Name;
    }
    public void setName(String Name) {
        this.Name = Name;
    }
    public String getPhone() {
        return Phone;
    }
    public void setPhone(String Phone) {
        this.Phone = Phone;
    }
    public String getEmail() {
        return Email;
    }
    public void setEmail(String Email) {
        this.Email = Email;
    }
    public String getAddress() {
        return Address;
    }
    public void setAddress(String Address) {
        this.Address = Address;
    }
    public String getSubject() {
        return subject;
    }
    public void setSubject(String subject) {
        this.subject = subject;
    }
    public String getMechanism() {
        return mechanism;
    }
    public void setMechanism(String mechanism) {
        this.mechanism = mechanism;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public String getFile() {
        return file;
    }
    public void setFile(String file) {
        this.file = file;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
}

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

@@ -867,6 +867,8 @@ public class BaseRequestMapping {
        public static final String FINDALL = "/findAll";
        public static final String CHANGESTATUS = "/changestatus";
        public static final String REPLY = "/reply";
        public static final String FILEDOWNLOAD = "/fileDownLoad";
        public static final String FILEUPLOAD = "/fileUpLoad";
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -339,7 +339,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }
        WlyyUserSimple wlyyUserSimple = userDetailsService.authSuccess(parameters.get("username"));
        if ("pad".equals(parameters.get("clientType"))&&!("1".equals(wlyyUserSimple.getArchiveType())) ){//医养平板端登录限制
        if ("pad".equals(parameters.get("clientType"))&&("2".equals(wlyyUserSimple.getArchiveType())) ){//医养平板端登录限制
            throw new InvalidGrantException("不允许登录该平台");
        }
        wlyyUserSimple.setAccessToken(token.getValue());

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/searchClient/ClientSearchEndpoint.java

@@ -0,0 +1,134 @@
package com.yihu.jw.base.endpoint.searchClient;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.base.service.clientSearch.ClientSearchService;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import com.yihu.jw.entity.base.searchClient.FileResourceVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;
/**
 * Created by wsy on 2021/9/4.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.ClientSearch.PREFIX)
@Api(value = "查新查重服务",description = "查新查重服务",tags = {"查新查重服务"})
public class ClientSearchEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ClientSearchService clientSearchService;
    @PostMapping(value = BaseRequestMapping.ClientSearch.CREATE)
    @ApiOperation(value = "保存查新查重服务")
    public Envelop saveBaseSearchNoveltyRepeat(@ApiParam(name = "jsonData",value = "")
                                               @RequestParam(name = "jsonData", required = true) String jsonData) throws Exception{
        try{
            BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = objectMapper.readValue(jsonData, BaseSearchNoveltyRepeatDO.class);
            clientSearchService.saveBaseSearchNoveltyRepeat(baseSearchNoveltyRepeatDO);
            return success("success");
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping(BaseRequestMapping.ClientSearch.DELETEBYID)
    @ApiOperation(value = "删除查新查重")
    public Envelop deleteSearchNoveltyRepeatById(@ApiParam(name = "id",value = "")
                                                 @RequestParam(name = "id", required = true) String id) throws Exception{
        try{
            clientSearchService.deleteByid(id);
            return success("success");
        }catch(Exception e){
            return failedException(e);
        }
    }
    @GetMapping(BaseRequestMapping.ClientSearch.FINDBYSEARCHDATA)
    @ApiOperation(value = "根据搜索查询")
    public Envelop findSearchNoveltyRepeatById(@ApiParam(name = "SearchData", value = "查询字段")
                                               @RequestParam(name = "SearchData", required = true) String SearchData) throws Exception{
        try{
            List list;
            list = clientSearchService.findBySearchData(SearchData);
            return success("success",list);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(BaseRequestMapping.ClientSearch.FINDALL)
    @ApiOperation("查询所有")
    public Envelop findSearchNoveltyRepeatAll( @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
                                               @RequestParam(value = "fields", required = false) String fields,
                                               @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
                                               @RequestParam(value = "filters", required = false) String filters,
                                               @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
                                               @RequestParam(value = "sorts", required = false) String sorts,
                                               @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) throws Exception{
        try{
            List<BaseSearchNoveltyRepeatDO> list = clientSearchService.search(fields,filters,sorts,page,pageSize);
            int count = (int) clientSearchService.getCount(filters);
            return success("success",200,list,count,page,pageSize);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(BaseRequestMapping.ClientSearch.CHANGESTATUS)
    @ApiOperation("变更状态")
    public Envelop changeStatus(@ApiParam(name = "id", value = "")
                                @RequestParam(value = "id",required = true) String id,
                                @ApiParam(name = "status",value = "1 待接收、2 办理中、3 已退回、4 已办结")
                                @RequestParam(name = "status",required = true) Integer status){
        try{
            clientSearchService.updateById(id,status);
            return success("success");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(BaseRequestMapping.ClientSearch.REPLY)
    @ApiOperation("答复")
    public Envelop reply(@ApiParam(name = "id", value = "")
                         @RequestParam(value = "id",required = true) String id,
                         @ApiParam(name = "reply",value = "")
                         @RequestParam(name = "reply",required = true) String reply,
                         @ApiParam(name = "updateUser",value = "答复操作人")
                         @RequestParam(name = "updataUser",required = true) String updataUser){
        try{
            clientSearchService.updateReply(id,reply,updataUser);
            return success("success");
        }catch (Exception e){
            return failedException(e);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/clientSearch/ClientSearchService.java

@@ -38,6 +38,8 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
        //获取随机数
        int number = r.nextInt();
        baseSearchNoveltyRepeatDO.setNumber(Integer.toString(number).replace("-",""));
        baseSearchNoveltyRepeatDO.setStatus(1);
        baseSearchNoveltyRepeatDO.setStatusName("待接收");
        baseSearchNoveltyRepeatDO.setCreateTime(new Date());
        return baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
    }
@@ -60,7 +62,22 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public void updateById(String id, Integer status) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findOne(id);
        if (baseSearchNoveltyRepeatDO != null){
            if(status == 1){
                baseSearchNoveltyRepeatDO.setStatusName("待接收");
            }
            if(status == 2){
                baseSearchNoveltyRepeatDO.setStatusName("办理中");
            }
            if(status == 3){
                baseSearchNoveltyRepeatDO.setStatusName("已退回");
            }
            if(status == 4){
                baseSearchNoveltyRepeatDO.setStatusName("已办结");
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
            Date date = new Date();
           /* baseSearchNoveltyRepeatDO.setUpdate_time(sdf.format(date));*/
@@ -82,4 +99,11 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
            baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
        }
    }
    public BaseSearchNoveltyRepeatDO findFileById(String id){
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = new BaseSearchNoveltyRepeatDO();
        baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findOne(id);
        return baseSearchNoveltyRepeatDO;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -256,9 +256,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //pc管理端端推送消息
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(assistanceDO.getId(),null);
        result.put("resultFlag", ResponseContant.success);
        result.put("resultMsg",assistanceDO);
        return result;
    }
    public JSONObject getOrderDetail(String orderID,String doctor){
@@ -372,7 +373,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //附加信息 紧急救助无
        //通知对象
        List<Map<String,Object>> noticePersons = new ArrayList<>();
        JSONArray familyArr =  familyMemberService.getPatientMembers(assistanceDO.getPatient(),null,null,null,null);
        JSONArray familyArr =  familyMemberService.getPatientMembers(assistanceDO.getPatient(),null,null,null,"3");
        String emeCallPhone = "";
        if (assistanceDO.getOrderSource()!=1){//设备发起工单
//            String category = assistanceDO.getOrderSource()==2?"4":"7";

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultTeamService.java

@@ -207,7 +207,7 @@ public class ConsultTeamService {
            participants.put(patientId, 0);//家庭成员拉入会话
        }
        for (int i=0;i<agentFamilyArr.size();i++){//创建家属系统消息
            JSONObject tmp = familyArr.getJSONObject(i);
            JSONObject tmp = agentFamilyArr.getJSONObject(i);
            String patientId = tmp.getString("id");
            if (patient.equals(patientId)){
                continue;
@@ -419,8 +419,8 @@ public class ConsultTeamService {
            }
            participants.put(patientId, 0);
        }
        for (int i=0;i<familyArr.size();i++){
            JSONObject tmp = familyArr.getJSONObject(i);
        for (int i=0;i<agentFamilyArr.size();i++){
            JSONObject tmp = agentFamilyArr.getJSONObject(i);
            String patientId = tmp.getString("id");
            if (patient.equals(patientId)){
                continue;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YunXunDeviceService.java

@@ -51,7 +51,7 @@ public class YunXunDeviceService {
     */
    public void sendInstruction(String sn,String instruction){
        try {
            String url = "http://117.24.13.79:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String url = "http://www.cityihealth.com:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String response = httpClientUtil.get(url,"UTF-8");
            logger.info("sendInstruction="+response);
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -355,6 +355,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
            obj.put("familyRelationName", "自己");
            obj.put("isAuthorize", 1);//0:未授权,1:已授权
            obj.put("authorizeStatus", 3);//
            obj.put("archiveType", p.getArchiveType());//
            if (jtSign) {
                obj.put("signType", 1);
@@ -385,7 +386,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                "    and t1.patient = ? " +
                "    and t1.family_member = t2.id ";
        if (StringUtils.isNotBlank(archive_type)){
            sql += " and t2.archive_type='"+archive_type+"' ";
            sql += " and t2.archive_type in ('"+archive_type.replace(",","','")+"') ";
        }
/*        if(isContacts != null){
            sql += " and t1.is_contacts = "+ isContacts;
@@ -417,6 +418,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                obj.put("address", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));
                obj.put("familyRelation", map.get("family_relation"));
                obj.put("familyRelationName", relations.get(map.get("family_relation")));
                obj.put("archiveType",StringUtils.isEmpty(String.valueOf(map.get("archive_type"))) ?"":map.get("archive_type"));
                if (!StringUtils.isEmpty(doctorCode)) {
                    obj.put("relaholder", relations.get(map.get("family_relation")));

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -424,7 +424,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        //通知对象
        List<Map<String,Object>> noticePersons = new ArrayList<>();
        JSONArray familyArr =  familyMemberService.getPatientMembers(orderDO.getPatient(),null,null,null,null);
        JSONArray familyArr =  familyMemberService.getPatientMembers(orderDO.getPatient(),null,null,null,"3");
        for (int i=0;i<familyArr.size();i++){
            String patientId = familyArr.getJSONObject(i).getString("id");
            BasePatientDO patientDO1 = basePatientDao.findById(patientId);

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/device/YunXunDeviceService.java

@@ -51,7 +51,7 @@ public class YunXunDeviceService {
     */
    public void sendInstruction(String sn,String instruction){
        try {
            String url = "http://117.24.13.79:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String url = "http://www.www.cityihealth.com:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String response = httpClientUtil.get(url,"UTF-8");
            logger.info("sendInstruction="+response);
        }catch (Exception e){