Merge branch 'dev' of xiaoyunquan/wlyy2.0 into dev

common/common-entity/sql记录

@@ -1820,4 +1820,9 @@ CREATE TABLE `base_visit_sign` (
  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  `del` int(2) DEFAULT NULL COMMENT '是否删除1为删除，0.为正常',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=257 DEFAULT CHARSET=utf8mb4 COMMENT='日常走访签到';
) ENGINE=InnoDB AUTO_INCREMENT=257 DEFAULT CHARSET=utf8mb4 COMMENT='日常走访签到';
ALTER TABLE `base`.`base_device_repair`
ADD COLUMN `type` tinyint(2) NULL COMMENT '类型。空是保修，0是设备异常登记维护信息' AFTER `feedback`;

common/common-entity/src/main/java/com/yihu/jw/entity/patient/BaseDeviceRepairEntity.java

@@ -31,6 +31,17 @@ public class BaseDeviceRepairEntity extends IdEntity {
    private Date dealTime; //处理时间
    private String feedback; //反馈
    private Integer type;//类型。空是保修，0是设备异常登记维护信息
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Column(name = "order_id")
    public String getOrderId() {
        return orderId;

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -1524,4 +1524,27 @@ public class DateUtil {
        return calendar.getTime();
    }
    /**
     * 获取指定时间和当前时间的距离
     * 几秒前、几分钟前、几小时前、几天前
     * @param l1 秒级时间戳
     * @return
     */
    public static String getTimeAgeStr(Long l1){
        String timeAgoStr = "";
        BigDecimal b1 = new BigDecimal(l1);
        BigDecimal b2 = new BigDecimal(System.currentTimeMillis()/1000);
        BigDecimal subtract = b2.subtract(b1);//秒数
        if(subtract.compareTo(new BigDecimal(60))<0){//小于一分钟前
            timeAgoStr = subtract.toString()+"秒前";
        }else if(subtract.compareTo(new BigDecimal(3600))<0){//小于一小时
            timeAgoStr = subtract.divide(new BigDecimal(60),0,BigDecimal.ROUND_HALF_DOWN).toString()+"分钟前";
        }else if(subtract.compareTo(new BigDecimal(86400))<0){//小于一天
            timeAgoStr = subtract.divide(new BigDecimal(3600),0,BigDecimal.ROUND_HALF_DOWN).toString()+"小时前";
        }else {//超过一天
            timeAgoStr = subtract.divide(new BigDecimal(86400),0,BigDecimal.ROUND_HALF_DOWN).toString()+"天前";
        }
        return timeAgoStr;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/message/DoctorMessageEndpoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.message;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.common.PermissionService;
import com.yihu.jw.care.service.message.DoctorMessageService;
import com.yihu.jw.care.service.message.PatientMessageService;
import com.yihu.jw.restmodel.ResponseContant;
@@ -26,6 +27,8 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
    private DoctorMessageService doctorMessageService;
    @Autowired
    private PatientMessageService patientMessageService;
    @Autowired
    private PermissionService permissionService;
    @GetMapping(value = "messages")
    @ApiOperation("应用消息")
@@ -151,4 +154,60 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = "/submitRepairMessage")
    @ApiOperation("登记维护信息")
    @ObserverRequired
    public Envelop submitRepairMessage(@ApiParam @RequestParam String id,
                                       @ApiParam @RequestParam String patientId,
                                       @ApiParam @RequestParam String deviceCode,
                                       @ApiParam @RequestParam String content,
                                       @ApiParam @RequestParam String doctorId,
                                       @ApiParam @RequestParam String doctorName,
                                       @ApiParam @RequestParam(required = false,value = "deviceName") String deviceName,
                                       @ApiParam @RequestParam(required = false,value = "img")String img){
        try{
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("doctorId",permissionService.getUID());
            if (permissionService.noPermission(1, jsonObject)) {
                return ObjEnvelop.getError("该操作没有权限",-1);
            }
            return doctorMessageService.submitRepairMessage(id, patientId, deviceCode, deviceName,doctorId,doctorName,content,img);
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value = "/getRepairMessageList")
    @ApiOperation("维护信息列表")
    public PageEnvelop getRepairMessageList(@ApiParam @RequestParam String doctorId,
                                            @ApiParam @RequestParam(required = false,value = "page",defaultValue = "1")Integer page,
                                            @ApiParam @RequestParam(required = false,value = "pageSize",defaultValue = "20")Integer pageSize,
                                            @ApiParam @RequestParam(required = false,value = "name")String name){
        try {
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("doctorId",permissionService.getUID());
            if (permissionService.noPermission(1, jsonObject)) {
                return PageEnvelop.getError("该操作没有权限",-1);
            }
            return doctorMessageService.getRepairMassageList(doctorId, page, pageSize,name);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }
    }
    @GetMapping(value = "/getRepairMessageListById")
    @ApiOperation("根据id获取一条维护信息")
    public ObjEnvelop getRepairMessageListById(@ApiParam @RequestParam Integer id){
        try {
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("doctorId",permissionService.getUID());
            if (permissionService.noPermission(1, jsonObject)) {
                return ObjEnvelop.getError("该操作没有权限",-1);
            }
            return doctorMessageService.getRepairMessageListById(id);
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -11,7 +11,6 @@ import com.yihu.jw.entity.patient.BaseDeviceRepairEntity;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import net.sf.json.JSONArray;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -99,7 +98,8 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
                         " AND dr.device_sn = pd.device_sn" +
                         " AND pd. USER = ph.patient" +
                         " AND ph.doctor = '"+doctor+"'" +
                         " AND ph.del = '1'";
                         " AND ph.del = '1'  " +
                         " AND dr.type is null ";
            } else {
                 repairSql = "SELECT DISTINCT dr.order_id AS id,dr.bind_user_name AS patientName, pd.category_code as categoryCode," +
                        " dr.`status` AS `status`,dr.create_time AS createTime,dr.repair_peoper_name AS repairName,wd.device_name AS deviceName" +
@@ -117,6 +117,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
                        " AND dd.model = wd.device_model" +
                        " AND p.del = 1" +
                        " AND pd.device_sn = dr.device_sn" +
                        " AND dr.type is null " +
                        " and EXISTS (SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
                        " WHERE sr.patient = p.id and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id AND dr.repair_peoper = m.doctor_code" +
                        " and m.doctor_code = '" + doctor + "' and m.del = '1')";
@@ -142,7 +143,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
    /*报修详细信息*/
    public List<BaseDeviceRepairEntity> getRepairInfo(String orderId) {
        return jdbcTemplate.query("SELECT * from base_device_repair WHERE order_id = '" + orderId + "'", new BeanPropertyRowMapper<>(BaseDeviceRepairEntity.class));
        return jdbcTemplate.query("SELECT * from base_device_repair WHERE type is null and order_id = '" + orderId + "'", new BeanPropertyRowMapper<>(BaseDeviceRepairEntity.class));
    }
    /*报修*/
@@ -185,7 +186,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
                " DATE_FORMAT( dr.create_time ,'%Y-%m-%d %H:%i:%S') createTime " ;
        String countSql = " select count(distinct dr.id) ";
        String filterSql =  " FROM wlyy_patient_device pd,base_device_repair dr,base_patient p " +
                "WHERE p.id = pd.user AND pd.del = 0 AND dr.device_sn = pd.device_sn and p.del=1  ";
                "WHERE p.id = pd.user AND pd.del = 0 AND dr.device_sn = pd.device_sn and p.del=1 and dr.type is null  ";
        if (StringUtils.isNotBlank(status)){
            filterSql += " and dr.status='"+status+"' ";
        }
@@ -205,7 +206,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
                " DATE_FORMAT( dr.create_time ,'%Y-%m-%d %H:%i:%S') createTime,  DATE_FORMAT( pd.czrq ,'%Y-%m-%d %H:%i:%S') czrq, " +
                " dr.show_content,dr.img,dr.feedback " +
                "FROM wlyy_patient_device pd,base_device_repair dr,base_patient p " +
                "WHERE p.id = pd.user AND pd.del = 0 AND dr.device_sn = pd.device_sn and p.del=1 and dr.id='"+orderId+"' ";
                "WHERE p.id = pd.user AND pd.del = 0 AND dr.device_sn = pd.device_sn and dr.type is null and p.del=1 and dr.id='"+orderId+"' ";
        List <Map<String,Object>> list =  jdbcTemplate.queryForList(sql);
        if (list.size()>0){
            result = list.get(0);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/DoctorMessageService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yihu.jw.care.dao.apply.PatientBedApplyDao;
import com.yihu.jw.care.dao.device.BaseDeviceRepairDao;
import com.yihu.jw.care.dao.device.DeviceDetailDao;
import com.yihu.jw.care.dao.message.OrgNoticeDao;
import com.yihu.jw.care.dao.message.UserNoticeDao;
import com.yihu.jw.care.dao.security.SecurityMonitoringOrderDao;
@@ -14,9 +16,15 @@ import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.notice.UserNoticeDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.entity.care.message.OrgNoticeDO;
import com.yihu.jw.entity.patient.BaseDeviceRepairEntity;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.entity.EntityUtils;
@@ -24,6 +32,8 @@ 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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.*;
@@ -54,6 +64,14 @@ public class DoctorMessageService {
    private DoctorServicePermissionsService doctorServicePermissionsService;
    @Autowired
    private RoleService roleService;
    @Autowired
    private BaseDeviceRepairDao baseDeviceRepairDao;
    @Autowired
    private PatientMessageService patientMessageService;
    @Autowired
    private DeviceDetailDao deviceDetailDao;
    @Autowired
    private BasePatientDao basePatientDao;
    /**
     *
@@ -323,7 +341,7 @@ public class DoctorMessageService {
       // List<SystemMessageDO> systemMessageDOS = messageDao.getByReceiverAndType(doctor,"43");
        String sql =  "select DISTINCT sm.id as id,sm.type AS type,sm.title AS title,sm.sender AS sender,sm.sender_name AS senderName,\n" +
                "  sm.receiver AS receiver,sm.receiver_name AS receiver_name,sm.relation_code AS relationCode,\n" +
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name" +
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,UNIX_TIMESTAMP(sm.create_time) AS createTimeNum,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name" +
                "  from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn where sm.receiver = '"+doctor+"' AND sm.type=43 and sm.del=1 ";
        if (StringUtils.isNotBlank(deviceCode)&&!"''".equals(deviceCode)){
@@ -336,6 +354,10 @@ public class DoctorMessageService {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : maps) {
            Long l = (Long) map.get("createTimeNum");
            map.put("timeAgoStr",DateUtil.getTimeAgeStr(l));
        }
        return maps;
    }
@@ -476,4 +498,101 @@ public class DoctorMessageService {
        return result;
    }
    /**
     * 登记维护信息
     * @param id 消息id
     * @param patientId 居民code
     * @param deviceCode 设备sn
     * @param deviceName 设备名称
     * @param doctorId 医生id
     * @param doctorName 医生名字
     * @param content 处理内容
     * @param img 图片
     * @return
     */
    @Transactional
    public Envelop submitRepairMessage(String id,String patientId,String deviceCode,String deviceName,String doctorId,String doctorName,String content,String img){
        BaseDeviceRepairEntity baseDeviceRepairEntity = new BaseDeviceRepairEntity();
        baseDeviceRepairEntity.setOrderId(id);
        baseDeviceRepairEntity.setDeviceSn(deviceCode);
        if(StringUtils.isBlank(deviceName)){
            //查设备
            DeviceDetail bySn = deviceDetailDao.findBySn(deviceCode);
            if(bySn != null){
                deviceName = bySn.getDeviceName();
            }
        }
        baseDeviceRepairEntity.setDeviceName(deviceName);
        baseDeviceRepairEntity.setBindUser(patientId);
        //查居民名字
        BasePatientDO byId = basePatientDao.findById(patientId);
        String userName = "";
        if(byId != null){
            userName = byId.getName();
        }
        baseDeviceRepairEntity.setBindUserName(userName);
        baseDeviceRepairEntity.setStatus(1);
        baseDeviceRepairEntity.setRepairPeoper(patientId);
        baseDeviceRepairEntity.setRepairPeoperName(userName);
        Date nowDate = DateUtil.getNowDate();
        baseDeviceRepairEntity.setCreateTime(nowDate);
        baseDeviceRepairEntity.setImg(img);
        baseDeviceRepairEntity.setDealTime(nowDate);
        baseDeviceRepairEntity.setFeedback(content);
        baseDeviceRepairEntity.setType(0);
        baseDeviceRepairEntity.setDealPeoper(doctorId);
        baseDeviceRepairEntity.setDealPeoperName(doctorName);
        baseDeviceRepairDao.save(baseDeviceRepairEntity);
        patientMessageService.delMessageRead(id);
        return Envelop.getSuccess("操作成功");
    }
    /**
     * 维护信息列表
     * @param doctorId
     * @param page
     * @param pageSize
     * @param name
     * @return
     */
    public PageEnvelop getRepairMassageList(String doctorId,Integer page,Integer pageSize,String name){
        page = page>0?page-1:0;
        String selectSql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo ";
        String sql = " from base_device_repair re left join base_patient p on re.bind_user = p.id " +
                " where re.type = 0 and re.status = 1 and re.deal_peoper = '"+doctorId+"' ";
        if(StringUtils.isNotBlank(name)){
            sql += " and ( p.name like '%"+name+"%' or p.idcard like '%"+name+"%') ";
        }
        String pageSql = " limit "+page*pageSize+","+pageSize+" ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(selectSql + sql + pageSql);
        String countSql = "SELECT COUNT(re.id) ";
        Long total = jdbcTemplate.queryForObject(countSql + sql, Long.class);
        //计算时间差
        //for (Map<String, Object> map : list) {
        //    Long l1 = (Long) map.get("dealTimeNum");
        //    map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
        //}
        return PageEnvelop.getSuccessListWithPage("获取成功",list,page,pageSize,total);
    }
    /**
     * 根据id获取一条维护信息
     * @param id
     * @return
     */
    public ObjEnvelop getRepairMessageListById(Integer id){
        String sql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo,re.feedback,re.img " +
                " from base_device_repair re left join base_patient p on re.bind_user = p.id where re.type = 0 and re.id = "+id;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        Map<String, Object> map = new HashMap<>();
        if(!ObjectUtils.isEmpty(list)){
            map = list.get(0);
            //Long l1 = (Long) map.get("dealTimeNum");
            //map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
            return ObjEnvelop.getSuccess("获取成功",map);
        }
        return ObjEnvelop.getError("无数据");
    }
}

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

@@ -2666,12 +2666,15 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject();
                String deviceSn = "";
                List<String> deviceSns = jdbcTemplate.queryForList("select pd.device_sn from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItemTmp + "',dd.service_topic)", String.class);
                String deviceCode = "";
                List<Map<String, Object>> deviceSns = jdbcTemplate.queryForList("select pd.device_sn,pd.category_code from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItemTmp + "',dd.service_topic)");
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                    deviceSn = deviceSns.get(0).get("device_sn").toString();
                    deviceCode = deviceSns.get(0).get("category_code").toString();
                }
                object.put("deviceSn", deviceSn);
                object.put("deviceCode", deviceCode);
                switch (topicItem) {
                    case "actionTrack":
@@ -2712,14 +2715,17 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            for (int i = 0; i < list.size(); i++) {
                Map<String, Object> patientTmp = list.get(i);
                String deviceSn = "";
                List<String> deviceSns = jdbcTemplate.queryForList("select pd.device_sn from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItem + "',dd.service_topic)", String.class);
                String deviceCode = "";
                List<Map<String, Object>> deviceSns = jdbcTemplate.queryForList("select pd.device_sn,pd.category_code from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItem + "',dd.service_topic)");
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                    deviceSn = deviceSns.get(0).get("device_sn").toString();
                    deviceCode = deviceSns.get(0).get("category_code").toString();
                }
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", null,false);
                object.put("deviceSn", deviceSn);
                object.put("patientInfo", patientTmp);
                object.put("deviceCode", deviceCode);
                monitorInfos.add(object);
            }
            result.put("topicInfo", monitorInfos);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/DetectionPlatformService.java

@@ -849,9 +849,4 @@ public class DetectionPlatformService  {
        }
        return ObjEnvelop.getError("失败");
    }
    public static void main(String[] args) {
        String sss= "qwe.mp4";
        System.out.println(sss.substring(0,sss.lastIndexOf(".")));
    }
}