111

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

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.admin;
import com.yihu.jw.care.service.admin.AdminManageService;
import com.yihu.jw.care.service.common.PermissionService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -24,6 +25,8 @@ public class AdminManageEndpoint extends EnvelopRestEndpoint {
    @Resource
    private AdminManageService adminManageService;
    @Resource
    private PermissionService permissionService;
    @GetMapping(value = "getEmergencyAssistanceNum")
    @ApiOperation(value = "获取紧急救助预警中的工单数")
@@ -67,7 +70,20 @@ public class AdminManageEndpoint extends EnvelopRestEndpoint {
    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);
            adminManageService.orderUrgeReminder(id,orderType, permissionService.getUID());
            return success("提醒成功");
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("提醒失败");
        }
    }
    @GetMapping(value = "jobOrderUrgeReminder")
    @ApiOperation(value = "job工单催促提醒")
    public Envelop systemOrderUrgeReminder(@ApiParam(name = "orderType",value = "类型 20紧急呼叫22安防工单") @RequestParam String orderType,
                                     @ApiParam(name = "id",value = "工单id") @RequestParam String id){
        try {
            adminManageService.orderUrgeReminder(id,orderType,"system");
            return success("提醒成功");
        }catch (Exception e){
            e.printStackTrace();

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

@@ -4,7 +4,6 @@ import com.yihu.jw.care.dao.assistance.EmergencyAssistanceDao;
import com.yihu.jw.care.dao.message.UrgeReminderRecordDao;
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;
@@ -46,8 +45,6 @@ public class AdminManageService {
    @Resource
    private BaseTeamMemberDao baseTeamMemberDao;
    @Resource
    private PermissionService permissionService;
    @Resource
    private BaseDoctorDao doctorDao;
    @Resource
    private UrgeReminderRecordDao urgeReminderRecordDao;
@@ -63,7 +60,7 @@ public class AdminManageService {
     * 工单催促提醒
     * 20紧急呼叫22安防工单
     */
    public void orderUrgeReminder(String id,String orderType){
    public void orderUrgeReminder(String id,String orderType,String sender){
        synchronized (id.intern()){
            UrgeReminderRecordDO recordDO = urgeReminderRecordDao.findByTypeAndOrderId(orderType,id);
            if(recordDO==null){
@@ -71,8 +68,7 @@ public class AdminManageService {
                recordDO.setOrderId(id);
                recordDO.setType(orderType);
                urgeReminderRecordDao.save(recordDO);
                String sender = permissionService.getUID();
                BaseDoctorDO baseDoctorDO = doctorDao.findById(sender);
                BaseDoctorDO baseDoctorDO = getDoctorDO(id);
                String patient;
                String name;
                String teamCode;
@@ -97,6 +93,18 @@ public class AdminManageService {
        }
    }
    private BaseDoctorDO getDoctorDO(String id){
        BaseDoctorDO baseDoctorDO;
        if("system".equals(id)){
            baseDoctorDO = new BaseDoctorDO();
            baseDoctorDO.setId("system");
            baseDoctorDO.setName("系统");
        }else {
            baseDoctorDO = doctorDao.findById(id);
        }
        return baseDoctorDO;
    }
    //type   2社工 3助老员 4教师
    //2. 社区医院3.  养老机构 4.  托育机构
    public List<Map<String,Object>> getOrgList(String type){