LAPTOP-KB9HII50\70708 2 éve
szülő
commit
abb4241a11

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/care/assistance/EmergencyAssistanceDO.java

@ -23,7 +23,7 @@ public class EmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        ErrorWarning(-2, "已响应"),//误报警
        cancel(-1, "已取消"),
        complete(0, "已完成"),
        apply(1, "申请中");
        apply(1, "预警中");
        private Integer type;
        private String desc;

+ 15 - 5
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/admin/AdminManageEndpoint.java

@ -1,15 +1,13 @@
package com.yihu.jw.care.endpoint.admin;
import com.yihu.jw.care.service.admin.AdminManageService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -27,7 +25,7 @@ public class AdminManageEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getUserList")
    @ApiOperation(value = "获取人员列表")
    public PageEnvelop getUserList(@ApiParam(name = "type",value = "类型。1医生,2社工,3教师,4助老员 5幼儿") @RequestParam String type,
    public PageEnvelop getUserList(@ApiParam(name = "type",value = "类型type 1照护老人 2社工 3助老员 4教师 5幼儿") @RequestParam String type,
                                         @ApiParam(name = "page",value = "页码") @RequestParam Integer page,
                                         @ApiParam(name = "size",value = "每页大小") @RequestParam Integer size,
                                         @ApiParam(name = "name",value = "模糊搜索名字") @RequestParam(name = "name",required = false)String name){
@ -37,4 +35,16 @@ public class AdminManageEndpoint extends EnvelopRestEndpoint {
            return failedPageEnvelopException2(e);
        }
    }
    @PostMapping(value = "orderUrgeReminder")
    @ApiOperation(value = "工单催促提醒")
    public Envelop orderUrgeReminder(@ApiParam(name = "orderType",value = "类型 20紧急呼叫22安防工单") @RequestParam String orderType,
                                     @ApiParam(name = "id",value = "工单id") @RequestParam String id){
        try {
            adminManageService.orderUrgeReminder(id,orderType);
            return success("提醒成功");
        }catch (Exception e){
            return Envelop.getError("提醒失败");
        }
    }
}

+ 57 - 1
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/admin/AdminManageService.java

@ -1,7 +1,16 @@
package com.yihu.jw.care.service.admin;
import com.yihu.jw.care.dao.assistance.EmergencyAssistanceDao;
import com.yihu.jw.care.dao.security.SecurityMonitoringOrderDao;
import com.yihu.jw.care.dao.team.BaseTeamMemberDao;
import com.yihu.jw.care.service.common.PermissionService;
import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.care.vo.OrgVo;
import com.yihu.jw.care.vo.UserVo;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.care.assistance.EmergencyAssistanceDO;
import com.yihu.jw.entity.care.securitymonitoring.SecurityMonitoringOrderDO;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
@ -11,7 +20,11 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -22,6 +35,49 @@ public class AdminManageService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Resource
    private MessageUtil messageUtil;
    @Resource
    private EmergencyAssistanceDao emergencyAssistanceDao;
    @Resource
    private SecurityMonitoringOrderDao securityMonitoringOrderDao;
    @Resource
    private BaseTeamMemberDao baseTeamMemberDao;
    @Resource
    private PermissionService permissionService;
    @Resource
    private BaseDoctorDao doctorDao;
    /**
     * 工单催促提醒
     * 20紧急呼叫22安防工单
     */
    public void orderUrgeReminder(String id,String orderType){
        String sender = permissionService.getUID();
        BaseDoctorDO baseDoctorDO = doctorDao.findById(sender);
        String patient;
        String name;
        String teamCode;
        if("20".equals(orderType)){
            EmergencyAssistanceDO orderDO = emergencyAssistanceDao.findOne(id);
            patient = orderDO.getPatient();
            name = orderDO.getPatientName();
            teamCode = orderDO.getTeamCode();
        }else {
            SecurityMonitoringOrderDO orderDO = securityMonitoringOrderDao.findOne(id);
            patient = orderDO.getPatient();
            name = orderDO.getPatientName();
            teamCode = orderDO.getTeamCode();
        }
        List<BaseDoctorDO> doctorDOS = baseTeamMemberDao.findAllMembersByLevel(teamCode,2);
        for (BaseDoctorDO doctorDO:doctorDOS){
            String dingDingBody = doctorDO.getName()+"社工您好,"+name+"老人的紧急预警还未处理,管理员提醒您及时处理,请进入朝晖云照护应用查看。";
            messageUtil.sendDoctorDingdingMessage(doctorDO,null,"text","2",dingDingBody,null,null);
            messageUtil.createToDoWorkReminder(doctorDO.getId(),baseDoctorDO.getId(),baseDoctorDO.getName(),id,orderType);
        }
    }
    /**
     * 管理端通讯录