代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/Device.java

@@ -14,13 +14,13 @@ import java.util.Date;
@SequenceGenerator(name="id_generated", sequenceName="dm_device")
public class Device extends IdEntity {
	private String categoryCode;
	private String photo;
	private String brands;
	private String model;
	private String categoryCode;//设备类型
	private String photo;//
	private String brands;//设备品牌
	private String model;//设备型号
	private String isMultiUser;
	private String multiUser;
	private String name;
	private String name;//名称
	private Date czrq;
	private String del;
	private String serviceTopic;//设备所属专题 防走失 preventLost

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/im/ImJobService.java

@@ -93,6 +93,13 @@ public class ImJobService {
                String sessionId = map.get("id")+"";
                try {
                    imUtil.sendImMsg(dictDO.getDictCode(), dictDO.getDictValue(), sessionId, "1", content, "1", null);
                    //踢出非客服的医生
                    String participantsSql = "SELECT p.participant_id from im.participants p,base_doctor d " +
                            "WHERE p.session_id='"+sessionId+"' and p.participant_id=d.id and p.participant_id!='customer'";
                    List<Map<String,Object>> participantsList = jdbcTemplate.queryForList(participantsSql);
                    for (Map<String,Object> participants:participantsList){
                        imUtil.deleteParticipants(sessionId, participants.get("participant_id")+"");
                    }
                    imUtil.updateSessionStatus(sessionId,"1");
                }catch (Exception e){
                    e.printStackTrace();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/controller/DeviceController.java

@@ -140,7 +140,7 @@ public class DeviceController extends BaseController {
    public void addHeader(WritableSheet ws) throws WriteException {
        String[] header = {"设备名称","设备型号","SN码", "SIM卡号", "厂家名称", "厂家地址","法人", "联系人", "联系电话"};
        String[] header = {"设备名称","设备型号","SN码", "SIM卡号", "厂家名称", "厂家地址","法人", "联系人", "联系电话","设备类型编码"};
        int i = 0;
        for (String h : header) {
            addCell(ws, 0, i, h);//表名，行，列，header
@@ -164,6 +164,7 @@ public class DeviceController extends BaseController {
                addCell(ws, i, 6, m.getRepresentative(),"");
                addCell(ws, i, 7, m.getLinkman(),"");
                addCell(ws, i, 8, m.getTel(),"");
                addCell(ws, i, 9, m.getCategoryCode(),"");
                i++;
            }
            wwb.write();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/service/DeviceService.java

@@ -91,7 +91,7 @@ public class DeviceService {
			if(wlyyDevice.size()>0) {
				device.setId(wlyyDevice.get(0).getId());
			}
			qrcodeUtil.makeDeviceXcxQrcode(device,null,false);
			qrcodeUtil.makeDeviceXcxQrcode(device,null,true);
			deviceList.add(device);
		}
		deviceDetailDao.saveAll(deviceList);
@@ -186,7 +186,13 @@ public class DeviceService {
				device.setTel(data);
			}
		});
		//设备类型编码
		dataMap.put(9, new ExcelData() {
			@Override
			public void transform(String data) {
				device.setCategoryCode(data);
			}
		});
		return dataMap;
	}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/utils/QrcodeUtil.java

@@ -8,7 +8,6 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,14 +42,10 @@ public class QrcodeUtil {
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Autowired
    private WxAccessTokenService wxAccessTokenService;
    @Value("${wechat.id}")
    private String wxId;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    //获取设备二维码前缀
    // https://hlw.xmdsyy.cn/hlw/ims-wx/#/healthRecords/deviceBind?SN=
    // https://hlw.xmdsyy.cn/hlw/ims-wx/#/healthRecords/deviceBind?SN=&deviceId=
    public String devicePriUrl(){
        WlyyHospitalSysDictDO dictDO = wlyyHospitalSysDictDao.findById("devicePriUrl").orElse(null);
        if(dictDO!=null){
@@ -66,7 +61,7 @@ public class QrcodeUtil {
            String url = devicePriUrl();
            if (device!=null){
                if (flag||StringUtils.isBlank(device.getQrcode())){
                    InputStream ipt = com.yihu.jw.util.common.QrcodeUtil.createQrcode(url+device.getDeviceCode(), 300, "png");
                    InputStream ipt = com.yihu.jw.util.common.QrcodeUtil.createQrcode(url+device.getDeviceCode()+"&deviceId="+device.getCategoryCode(), 300, "png");
                    String qrcode = getFullUri(ipt);
                    device.setQrcode(qrcode);
//                deviceDetailDao.save(device);
@@ -77,7 +72,7 @@ public class QrcodeUtil {
            }else {
                for (DeviceDetail deviceTmp : deviceDetailList) {
                    if (StringUtils.isBlank(deviceTmp.getQrcode())){
                        InputStream ipt = com.yihu.jw.util.common.QrcodeUtil.createQrcode(url+deviceTmp.getDeviceCode(), 300, "png");
                        InputStream ipt = com.yihu.jw.util.common.QrcodeUtil.createQrcode(url+deviceTmp.getDeviceCode()+"&deviceId="+device.getCategoryCode(), 300, "png");
                        String qrcode = getFullUri(ipt);
                        deviceTmp.setQrcode(qrcode);
                        deviceDetailDao.save(deviceTmp);