From 0148c2f5a3de791421b965c0013083dfb69af9d5 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 18 Aug 2025 18:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E5=8B=A4=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../urk/controller/SendUserController.java | 99 ------ .../com/bonus/urk/mapper/SendUserMapper.java | 101 ------ .../bonus/urk/service/SendUserService.java | 305 ------------------ .../resources/mapper/urk/SendUserMapper.xml | 119 ------- 4 files changed, 624 deletions(-) delete mode 100644 bonus-modules/bonus-urk/src/main/java/com/bonus/urk/controller/SendUserController.java delete mode 100644 bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/SendUserMapper.java delete mode 100644 bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/SendUserService.java delete mode 100644 bonus-modules/bonus-urk/src/main/resources/mapper/urk/SendUserMapper.xml diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/controller/SendUserController.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/controller/SendUserController.java deleted file mode 100644 index f6eb024..0000000 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/controller/SendUserController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.bonus.urk.controller; - -import com.bonus.system.api.domain.SystemParamsVo; -import com.bonus.urk.service.SendUserService; -import io.swagger.annotations.Api; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author 黑子 - */ -@Api(tags = "考勤机业务员指令接口-人员下发及删除") -@RestController -@RequestMapping("/sedTask") -@Slf4j -public class SendUserController { - - @Autowired - private SendUserService service; - - /** - * 人员下发 及人员修改时触发 - * @param userId - * @param proId - * @param update - */ - @PostMapping("sendUserToDevice") - public void sendUserToDevice(int userId,int proId,String update) { - try { - service.sendUserToDevice(userId,proId, update); - } - catch (Exception e) { - log.error(e.toString(),e); - } - } - /** - * 新增考勤机 时触发 - * @param deviceCode - */ - @PostMapping("getUserSendToDev") - public void sendUserToDevice(String deviceCode,int proId) { - try { - service.getUserSendToDev(deviceCode,proId); - } - catch (Exception e) { - log.error(e.toString(),e); - } - } - - /** - * 删除当前考勤机的全部人员 - * @param deviceCode - * @param proId - */ - @PostMapping("delDevByProId") - public void delDevByProId(String deviceCode,int proId) { - try { - service.delDevByProId(deviceCode,proId); - } - catch (Exception e) { - log.error(e.toString(),e); - } - } - - /** - * 人员出场时触发 - */ - @PostMapping("delUserByDevice") - public void delUserByDevice(int userId ,int proId ) { - try { - service.delUserByDevice(userId,proId); - } - catch (Exception e) { - log.error(e.toString(),e); - } - } - - - - @PostMapping("delUserByDeviceList") - public void delUserByDeviceList(@RequestBody SystemParamsVo vo) { - try { - service.delUserByDeviceList(vo.getUserId(),vo.getProId()); - } - catch (Exception e) { - log.error(e.toString(),e); - } - } - - - - - - -} diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/SendUserMapper.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/SendUserMapper.java deleted file mode 100644 index d5138d6..0000000 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/SendUserMapper.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.bonus.urk.mapper; - -import com.bonus.urk.vo.DeviceVo; -import com.bonus.urk.vo.KqCmdTaskVo; -import com.bonus.urk.vo.KqDevUserIdVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author 黑子 - */ -@Mapper -public interface SendUserMapper { - - - /** - * 新增任务-及任务记录 - * @param taskVo - */ - void insertCmdTask(KqCmdTaskVo taskVo); - /** - * 新增任务-及任务记录 - * @param taskVo - */ - void insertCmdTaskHistory(KqCmdTaskVo taskVo); - - - - /** - * 查询当前工程全部在场人员 - * @param proId - * @return - */ - List getOnSiteUser(@Param("proId") int proId); - - /** - * 批量插入 任务人员管理表 - * @param list - * @param taskVo - */ - - void insertCmdTaskUser(@Param("list") List list,@Param("param") KqCmdTaskVo taskVo); - - void insertCmdTaskUserByInteger(@Param("list") List list,@Param("param") KqCmdTaskVo taskVo); - - /** - * 批量插入 设备任务记录 - * @param list - */ - void insertCmdTaskByDevice(@Param("list")List list); - - /** - * 批量插入任务数据 - * @param list - */ - void insertCmdTaskByDeviceHistory(@Param("list")List list); - - - /** - * 任务下发的用户信息 - * @param list - * @param userId - */ - void insertTaskUser(@Param("list")List list,@Param("userId") int userId); - - - /** - * 分页查询工程数据 - * @param proId - * @return - */ - List getDeviceVoByProId(@Param("proId") int proId); - - /** - * 查询工程是否史上海工程 - * @param proId - * @return - */ - Integer getProType(@Param("proId") int proId); - - /** - * 查询全部上海工程的考勤机 - * @return - */ - List getDeviceVoByProBySh(); - - /** - * 查询上海工程的全部人员 - * @return - */ - List getOnSiteUserBySh(); - - /** - * 获取设备列表数据 - * @param deviceCode - * @return - */ - List getDevUserId(@Param("deviceCode") String deviceCode); -} diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/SendUserService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/SendUserService.java deleted file mode 100644 index 86a224f..0000000 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/SendUserService.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.bonus.urk.service; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.nacos.shaded.com.google.common.collect.Maps; -import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.core.urk.TaskStatusEnum; -import com.bonus.urk.mapper.SendUserMapper; -import com.bonus.urk.vo.DeviceVo; -import com.bonus.urk.vo.KqCmdTaskVo; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @author 黑子 - * - */ -@Slf4j -@Service -public class SendUserService { - - public final static int PAGE_SIZE=10; - - - @Resource - private SendUserMapper mapper; - - - public void getUserSendToDev(String deviceCode,int proId) { - try{ - String createTime= DateUtils.getTime(); - KqCmdTaskVo taskVo=new KqCmdTaskVo(); - taskVo.setProId(String.valueOf(proId)); - taskVo.setCreateTime(createTime); - taskVo.setCmdCode("SET_USER_INFO"); - taskVo.setDeviceCode(deviceCode); - //等待执行 - taskVo.setTransStatus(TaskStatusEnum.WAIT.ordinal()); - //分页查询 - getUserSendToDev(proId,1,taskVo); - }catch (Exception e){ - log.error(e.toString(),e); - } - } - - - public void getUserSendToDev(int proId,int pageNum, KqCmdTaskVo taskVo){ - try{ - List list; - Integer isSh=mapper.getProType(proId); - PageHelper.startPage(pageNum, PAGE_SIZE); - if(isSh!=null && isSh==1){ - list=mapper.getOnSiteUserBySh(); - }else{ - list=mapper.getOnSiteUser(proId); - } - PageInfo pageInfo =new PageInfo(list); - //分页查询全部在场用户 - if (!list.isEmpty()){ - taskVo.setCmdParam(JSON.toJSONString(list)); - //添加任务 - mapper.insertCmdTask(taskVo); - //添加历史记录 - mapper.insertCmdTaskHistory(taskVo); - //添加人员 - mapper.insertCmdTaskUser(list,taskVo); - - int pageSize=pageInfo.getPageNum(); - int pageTotal=pageInfo.getPages(); - if(pageSize userList=new ArrayList<>(); - userList.add(userId); - String json= JSON.toJSONString(userList); - taskVo.setProId(String.valueOf(proId)); - taskVo.setCmdParam(json); - taskVo.setCreateTime(createTime); - taskVo.setCmdCode("SET_USER_INFO"); - //等待执行 - taskVo.setTransStatus(TaskStatusEnum.WAIT.ordinal()); - //分页查询 - sendUserToDevice(userId,proId,1,taskVo); - }catch (Exception e){ - log.error(e.toString(),e); - } - } - /** - * 下发人员分页 - * @param userId - * @param proId - * @param pageNum - * @param taskVo - */ - public void sendUserToDevice(int userId,int proId,int pageNum, KqCmdTaskVo taskVo){ - Integer isSh=mapper.getProType(proId); - List list; - PageHelper.startPage(pageNum, PAGE_SIZE); - //是上海的工程 - if(isSh!=null && isSh==1){ - list=mapper.getDeviceVoByProBySh(); - }else{ - list=mapper.getDeviceVoByProId(proId); - } - PageInfo pageInfo =new PageInfo(list); - //分页查询+ - if (!list.isEmpty()){ - List taskVos=new ArrayList<>(); - for (DeviceVo vo:list){ - taskVo.setDeviceCode(vo.getDevCode()); - taskVos.add(taskVo); - } - // 任务下发新增 - mapper.insertCmdTaskByDevice(taskVos); - mapper.insertCmdTaskByDeviceHistory(taskVos); - // 任务人员关联 - mapper.insertTaskUser(taskVos,userId); - - int pageSize=pageInfo.getPageNum(); - int pageTotal=pageInfo.getPages(); - if(pageSize userList=new ArrayList<>(); - String createTime= DateUtils.getTime(); - KqCmdTaskVo taskVo=new KqCmdTaskVo(); - userList.add(userId); - String json= JSON.toJSONString(userList); - taskVo.setCmdParam(json); - taskVo.setProId(String.valueOf(proId)); - - taskVo.setCreateTime(createTime); - taskVo.setCmdCode("DELETE_USER"); - //等待执行 - taskVo.setTransStatus(TaskStatusEnum.WAIT.ordinal()); - //分页查询 - sendUserToDevice(userId,proId,1,taskVo); - }catch (Exception e){ - log.error(e.toString(),e); - } - } - - public void delUserByDeviceList(List userId ,List proId) { - try{ - Map> map=Maps.newHashMap(); - //按照工程给人员分组 - for (int i = 0; i < proId.size(); i++) { - List list=map.get(proId.get(i)); - if(StringUtils.isEmpty(list)){ - list=new ArrayList<>(); - list.add(userId.get(i)); - map.put(proId.get(i),list); - }else{ - list.add(userId.get(i)); - map.replace(proId.get(i),list); - } - } - //循环 - map.forEach((key, value) -> { - String createTime= DateUtils.getTime(); - KqCmdTaskVo taskVo=new KqCmdTaskVo(); - String json= JSON.toJSONString(value); - taskVo.setProId(String.valueOf(key)); - taskVo.setCmdParam(json); - taskVo.setCreateTime(createTime); - taskVo.setCmdCode("DELETE_USER"); - //等待执行 - taskVo.setTransStatus(TaskStatusEnum.WAIT.ordinal()); - //分页查询 - sendUserToDeviceList(value,key,1,taskVo); - - }); - - }catch (Exception e){ - log.error(e.toString(),e); - } - } - public void sendUserToDeviceList(List userId,int proId,int pageNum, KqCmdTaskVo taskVo){ - Integer isSh=mapper.getProType(proId); - List list; - PageHelper.startPage(pageNum, PAGE_SIZE); - //是上海的工程 - if(isSh!=null && isSh==1){ - list=mapper.getDeviceVoByProBySh(); - }else{ - list=mapper.getDeviceVoByProId(proId); - } - PageInfo pageInfo =new PageInfo(list); - //分页查询+ - if (!list.isEmpty()){ - for (DeviceVo vo:list){ - taskVo.setDeviceCode(vo.getDevCode()); - String json= JSON.toJSONString(userId); - taskVo.setCmdParam(json); - // 下发 - mapper.insertCmdTask(taskVo); - mapper.insertCmdTaskHistory(taskVo); - //添加人员 - mapper.insertCmdTaskUserByInteger(userId,taskVo); - } - int pageSize=pageInfo.getPageNum(); - int pageTotal=pageInfo.getPages(); - if(pageSize list=mapper.getDevUserId(deviceCode); - PageInfo pageInfo =new PageInfo(list); - //分页查询+ - if (!list.isEmpty()){ - String json= JSON.toJSONString(list); - taskVo.setCmdParam(json); - //添加任务 - mapper.insertCmdTask(taskVo); - //添加历史记录 - mapper.insertCmdTaskHistory(taskVo); - //添加人员 - mapper.insertCmdTaskUser(list,taskVo); - int pageSize=pageInfo.getPageNum(); - int pageTotal=pageInfo.getPages(); - if(pageSize - - - - insert into pm_att_device(device_code,device_name,dev_model,on_line,is_active)values ( - #{devCode},#{deviceName},#{devModel},#{onLine},1 ) - - - - insert into kq_cmd_task ( - cmd_code, cmd_param, device_code, trans_status, - create_time, update_state, msg, pro_id - )values (#{cmdCode},#{cmdParam},#{deviceCode},#{transStatus},#{createTime},#{updateStatus},#{msg},#{proId} - ) - - - insert into kq_cmd_task_history (id, - cmd_code, cmd_param, device_code, trans_status, - create_time, update_state, msg, pro_id - )values (#{id},#{cmdCode},#{cmdParam},#{deviceCode},#{transStatus},#{createTime},#{updateStatus},#{msg},#{proId} - ) - - - insert into kq_task_user_list( - task_id,user_id )values - ( - #{item.id},#{userId} - ) - - - - - insert into kq_task_user_list( - task_id,user_id )values - ( - #{param.id}, #{item} - ) - - - - - insert into kq_task_user_list( - task_id,user_id )values - ( - #{param.id}, #{item} - ) - - - - - insert into kq_cmd_task ( - cmd_code, cmd_param, device_code, trans_status, create_time, update_state, msg, pro_id - )values - - (#{item.cmdCode},#{item.cmdParam},#{item.deviceCode},#{item.transStatus},#{item.createTime},#{item.updateStatus},#{item.msg},#{item.proId} - ) - - - - - insert into kq_cmd_task_history ( - id,cmd_code, cmd_param, device_code, trans_status,create_time, update_state, msg, pro_id - )values - - (#{item.id},#{item.cmdCode},#{item.cmdParam},#{item.deviceCode},#{item.transStatus},#{item.createTime},#{item.updateStatus},#{item.msg},#{item.proId} - ) - - - - - - - - - - - - - - -