考勤出入场修改
This commit is contained in:
parent
b7fe5542c0
commit
1c3747751a
|
|
@ -38,10 +38,12 @@ public class RemoteUakUtilsFallbackFactory implements FallbackFactory<RemoteUakU
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delDevByProId(int userId, int proId, String source) {
|
public void delDevByProId(String deviceCode, int proId, String source) {
|
||||||
R.fail("删除考勤机人员:" + throwable.getMessage());
|
R.fail("删除考勤机人员:" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delUserByDevice(int userId, int proId, String source) {
|
public void delUserByDevice(int userId, int proId, String source) {
|
||||||
R.fail("人员出场:" + throwable.getMessage());
|
R.fail("人员出场:" + throwable.getMessage());
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.bonus.bmw.domain.dto.WebFileDto;
|
||||||
import com.bonus.common.core.constant.SecurityConstants;
|
import com.bonus.common.core.constant.SecurityConstants;
|
||||||
import com.bonus.common.core.domain.R;
|
import com.bonus.common.core.domain.R;
|
||||||
import com.bonus.system.api.RemoteUploadUtilsService;
|
import com.bonus.system.api.RemoteUploadUtilsService;
|
||||||
|
import com.bonus.system.api.domain.FileVo;
|
||||||
import com.bonus.system.api.model.UploadFileVo;
|
import com.bonus.system.api.model.UploadFileVo;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -58,9 +59,9 @@ public class FileUploadUtils {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public UploadFileVo uploadBast64( String file, String sourceTable, String sourceId, String sourceType, String prefix, String bucketName ){
|
public UploadFileVo uploadBast64( String file, String sourceTable, String sourceId, String sourceType, String prefix, String bucketName ){
|
||||||
R<UploadFileVo> re=service.uploadBast64(file,sourceTable,sourceId,sourceType,prefix,bucketName, SecurityConstants.INNER);
|
FileVo fileVo=new FileVo(file,sourceTable,sourceType,prefix,bucketName,sourceId);
|
||||||
|
R<UploadFileVo> re=service.uploadBast64(fileVo, SecurityConstants.INNER);
|
||||||
if(re.getCode()==R.SUCCESS){
|
if(re.getCode()==R.SUCCESS){
|
||||||
UploadFileVo vo=re.getData();
|
|
||||||
return re.getData();
|
return re.getData();
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ public class DeviceServlet extends HttpServlet {
|
||||||
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.ERROR_NO_CMD);
|
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.ERROR_NO_CMD);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
redisUtils.setCacheObject("att_dev:status",1,600L, TimeUnit.SECONDS);
|
redisUtils.setCacheObject("att_dev:status:"+deviceVo.getDevCode(),1,600L, TimeUnit.SECONDS);
|
||||||
String asTransId = req.getHeader(Constant.DEVICE_HEADER_TRANS_ID);
|
String asTransId = req.getHeader(Constant.DEVICE_HEADER_TRANS_ID);
|
||||||
String requestCode = req.getHeader(Constant.DEVICE_HEADER_REQUEST_CODE);
|
String requestCode = req.getHeader(Constant.DEVICE_HEADER_REQUEST_CODE);
|
||||||
// zSetOperations.add(CacheConstant.DEVICE_ONLINE_SET_CACHE, deviceVo.getDevCode(), System.currentTimeMillis());
|
// zSetOperations.add(CacheConstant.DEVICE_ONLINE_SET_CACHE, deviceVo.getDevCode(), System.currentTimeMillis());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue