Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
马三炮 2025-08-16 16:58:42 +08:00
commit c04fd0b89d
1 changed files with 79 additions and 2 deletions

View File

@ -88,16 +88,89 @@ public class ResultService {
}
/**
* 考勤记录日志数据
* @param taskVo
* @param req
* @param resp
*/
public void insertLogData(KqCmdTaskVo taskVo, HttpServletRequest req, HttpServletResponse resp) {
try {
// 解析request输入流
String jsonStr = getRequestBody(req);
log.info("设备记录数据:{}", jsonStr);
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
resp.addHeader(Constant.DEVICE_HEADER_TRANS_ID, taskVo.getId());
resp.getWriter().write("");
} catch (Exception e) {
log.error(e.toString(),e);
}
}
public void insertDeviceInfo(KqCmdTaskVo taskVo, HttpServletRequest req, HttpServletResponse resp) {
try {
// 解析request输入流
String jsonStr = getRequestBody(req);
log.info("设备信息:{}", jsonStr);
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
resp.addHeader(Constant.DEVICE_HEADER_TRANS_ID, taskVo.getId());
resp.getWriter().write("");
} catch (Exception e) {
log.error(e.toString(),e);
}
}
/**
* 考勤机配置细腻系
* @param taskVo
* @param req
* @param resp
*/
public void insertDeviceSetting(KqCmdTaskVo taskVo, HttpServletRequest req, HttpServletResponse resp) {
try{
String jsonStr = getRequestBody(req);
log.info("设备配置信息:{}", jsonStr);
if(StringUtils.isNotBlank(jsonStr)) {
//数据处理
}
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
resp.addHeader(Constant.DEVICE_HEADER_TRANS_ID, taskVo.getId());
resp.getWriter().write("");
}catch (Exception e){
log.error(e.toString(),e);
}
}
/**
* 考情机用户信息
* @param taskVo
* @param req
* @param resp
*/
public void insertUserInfo(KqCmdTaskVo taskVo, HttpServletRequest req, HttpServletResponse resp) {
try {
// 解析request输入流
String jsonStr = getRequestBody(req);
log.info("获取设备用户信息:{}", jsonStr);
if(StringUtils.isNotBlank(jsonStr)) {
//数据处理
}
resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
resp.addHeader(Constant.DEVICE_HEADER_TRANS_ID, taskVo.getId());
resp.getWriter().write("");
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
/**
@ -108,8 +181,12 @@ public class ResultService {
*/
public void insertDeleteUser(KqCmdTaskVo taskVo, HttpServletRequest req, HttpServletResponse resp) {
List<String> userIds=mapper.getTaskUser(taskVo.getId());
mapper.delKqDevUser(userIds,taskVo.getDeviceCode());
try{
List<String> userIds=mapper.getTaskUser(taskVo.getId());
mapper.delKqDevUser(userIds,taskVo.getDeviceCode());
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}