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

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -333,7 +333,8 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
                List<Map<String,Object>> nameList = new ArrayList<>();
                List<Map<String,Object>> deviceList = new ArrayList<>();
                if (StringUtils.isNotEmpty(idCard)){
                    sql = sql +" and t.idcard = '"+AesEncryptUtils.encrypt(idCard)+"'";
//                    sql = sql +" and t.idcard = '"+AesEncryptUtils.encrypt(idCard)+"'";
                    sql = sql +" and t.idcard = '"+idCard+"'";
                    nameList = jdbcTempalte.queryForList(sql);
                }if (StringUtils.isNoneBlank(snCoed)){
                    sqlEqt = sqlEqt +" and t.device_code = '"+snCoed+"'";
@@ -342,9 +343,11 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
                if(nameList.size()>0){
                    String code = null==nameList.get(0).get("code")?"":nameList.get(0).get("code").toString();
                    String name = null==nameList.get(0).get("name")?"": ConcealUtil.nameOrAddrConceal(nameList.get(0).get("name").toString());
                    locationDataVO.setIdCard(AesEncryptUtils.decrypt(idCard));
//                    locationDataVO.setIdCard(AesEncryptUtils.decrypt(idCard));
//                    locationDataVO.setName(AesEncryptUtils.decrypt(name));
                    locationDataVO.setIdCard(idCard);
                    locationDataVO.setName(name);
                    locationDataVO.setCode(code);
                    locationDataVO.setName(AesEncryptUtils.decrypt(name));
                }
                if (deviceList.size()>0){
                    String equipmentName = null==deviceList.get(0).get("device_name")?"":deviceList.get(0).get("device_name").toString();