From 4399fdce559eaa56b1bc51ed737932e54fd1d31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Thu, 27 Nov 2025 17:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=BA=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmAppVersionController.java | 2 +- .../bonus/bmw/controller/KqCmdController.java | 51 +++++++++++++++ .../com/bonus/bmw/domain/vo/BmAppVersion.java | 50 +++++++++++++++ .../com/bonus/bmw/domain/vo/KqCmdBean.java | 58 +++++++++++++++++ .../com/bonus/bmw/domain/vo/TreeNode.java | 25 ++++++++ .../com/bonus/bmw/mapper/KqCmdMapper.java | 12 ++++ .../com/bonus/bmw/service/KqCmdService.java | 9 +++ .../CertificateStatisticsServiceImpl.java | 4 +- .../bmw/service/impl/KqCmdServiceImpl.java | 63 +++++++++++++++++++ .../bmw/service/impl/PmWorkerServiceImpl.java | 10 +-- .../resources/mapper/bmw/KqCmdTaskMapper.xml | 22 +++++++ 11 files changed, 298 insertions(+), 8 deletions(-) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmAppVersion.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/TreeNode.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/{ => impl}/CertificateStatisticsServiceImpl.java (98%) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java create mode 100644 bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmAppVersionController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmAppVersionController.java index d74b93d..11d1078 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmAppVersionController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmAppVersionController.java @@ -20,7 +20,7 @@ import java.util.List; * @author xxxxx */ @RestController -@RequestMapping("/bm_app_version") +@RequestMapping("/appVersion") public class BmAppVersionController extends BaseController { /** * 服务对象 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java new file mode 100644 index 0000000..63d8296 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java @@ -0,0 +1,51 @@ +package com.bonus.bmw.controller; + +import com.bonus.bmw.domain.vo.KqCmdBean; +import com.bonus.bmw.service.KqCmdService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** +* 考勤机操作控制层 +* +* @author fly +*/ +@Slf4j +@RestController +@RequestMapping("/kqManager") +public class KqCmdController extends BaseController { +/** +* 服务对象 +*/ + @Resource + private KqCmdService service; + + /** + * 工程-考勤机树 + * + * @param o 主键 + * @return 单条数据 + */ + @GetMapping("getProKqjTree") + @SysLog(title = "工程考勤机树", businessType = OperaType.QUERY, logType = 0, module = "工程考勤机树", details = "工程考勤机树") + public AjaxResult getProKqjTree(KqCmdBean o) { + try { + return service.getProKqjTree(o); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + + + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmAppVersion.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmAppVersion.java new file mode 100644 index 0000000..7c06948 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmAppVersion.java @@ -0,0 +1,50 @@ +package com.bonus.bmw.domain.vo; + +import java.util.Date; +import lombok.Data; + +/** + * APP版本表 + */ +@Data +public class BmAppVersion { + /** + * 自增主键 + */ + private Integer id; + + /** + * 版本号 + */ + private String version; + + /** + * apk名称 + */ + private String apkName; + + /** + * apk路径 + */ + private String apkPath; + + /** + * 更新内容 + */ + private String updateContent; + + /** + * 部署时间 + */ + private Date deployTime; + + /** + * 部署人员 + */ + private String deployUser; + + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java new file mode 100644 index 0000000..a6c2eca --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java @@ -0,0 +1,58 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * 考勤任务信息表 + */ +@Data +public class KqCmdBean { + /** + * 主键 + */ + private Integer id; + + /** + * 指令编码 + */ + private String cmdCode; + + /** + * 指令参数 + */ + private String cmdParam; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 任务状态 0 待执行 1已执行 2 完成 3执行失败 4 取消 + */ + private String transStatus; + + /** + * 任务执行更新时间 + */ + private Date transStatusUpdateTime; + + /** + * 更新状态 默认 0 1 则是更新数据 + */ + private Integer updateState; + + /** + * 消息内容 + */ + private String msg; + + /** + * 工程id + */ + private Integer proId; + + private String proName; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/TreeNode.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/TreeNode.java new file mode 100644 index 0000000..2d303db --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/TreeNode.java @@ -0,0 +1,25 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + + +@Data +public class TreeNode { + + private String id; + private String name; + private String type; + private List children; + + public TreeNode(String id, String name, String type) { + this.id = id; + this.name = name; + this.type = type; + this.children = new ArrayList<>(); + } + + public void addChild(TreeNode child) { this.children.add(child); } +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java new file mode 100644 index 0000000..a0b2be0 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java @@ -0,0 +1,12 @@ +package com.bonus.bmw.mapper; + +import com.bonus.bmw.domain.vo.KqCmdBean; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface KqCmdMapper { + + List getProKqjTree(KqCmdBean o); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java new file mode 100644 index 0000000..5bf0b79 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java @@ -0,0 +1,9 @@ +package com.bonus.bmw.service; + +import com.bonus.bmw.domain.vo.KqCmdBean; +import com.bonus.common.core.web.domain.AjaxResult; + +public interface KqCmdService{ + + AjaxResult getProKqjTree(KqCmdBean o); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/CertificateStatisticsServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/CertificateStatisticsServiceImpl.java similarity index 98% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/CertificateStatisticsServiceImpl.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/CertificateStatisticsServiceImpl.java index 3084a61..e1770ac 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/CertificateStatisticsServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/CertificateStatisticsServiceImpl.java @@ -1,13 +1,13 @@ -package com.bonus.bmw.service; +package com.bonus.bmw.service.impl; import com.bonus.bmw.mapper.CertificateStatisticsMapper; import com.bonus.bmw.domain.vo.CertificateStatisticsBean; +import com.bonus.bmw.service.CertificateStatisticsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * packageName com.bonus.gzrn.rnbmw.certificate.service diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java new file mode 100644 index 0000000..11b8a1a --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java @@ -0,0 +1,63 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.vo.KqCmdBean; +import com.bonus.bmw.domain.vo.TreeNode; +import com.bonus.bmw.mapper.KqCmdMapper; +import com.bonus.bmw.service.KqCmdService; +import com.bonus.common.core.web.domain.AjaxResult; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class KqCmdServiceImpl implements KqCmdService { + + @Resource + private KqCmdMapper mapper; + + + @Override + public AjaxResult getProKqjTree(KqCmdBean o) { + List list = mapper.getProKqjTree(o); + // 构建设备树 + List deviceTree = buildDeviceTree(list); + return AjaxResult.success(deviceTree); + } + + /** + * 构建设备树 + * @param data 包含pro_id和device_code的数据列表 + * @return 树形结构的根节点列表 + */ + public static List buildDeviceTree(List data) { + // 使用Map来存储pro_id到设备列表的映射 + Map> proToDeviceMap = new HashMap<>(); + // 遍历数据，建立映射关系 + for (KqCmdBean item : data) { + String proName = item.getProName(); + String deviceCode = item.getDeviceCode(); + proToDeviceMap.computeIfAbsent(proName, k -> new ArrayList<>()).add(deviceCode); + } + // 构建树形结构 + List result = new ArrayList<>(); + for (Map.Entry> entry : proToDeviceMap.entrySet()) { + String proName = entry.getKey(); + List deviceCodes = entry.getValue(); + // 创建项目节点 + TreeNode projectNode = new TreeNode(proName, "项目" + proName, "project"); + // 为每个设备码创建子节点 + for (String deviceCode : deviceCodes) { + TreeNode deviceNode = new TreeNode(deviceCode, "设备" + deviceCode, "device"); + projectNode.addChild(deviceNode); + } + result.add(projectNode); + } + + return result; + } + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index eb98adf..db1974e 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -341,11 +341,11 @@ public class PmWorkerServiceImpl implements PmWorkerService{ } //合同 BmWorkerWageCard bmWorkerWageCard = new BmWorkerWageCard(); - bmWorkerWageCard.setWorkerId(worker.getId()); - bmWorkerWageCard.setBankCardCode(worker.getBankCardCode()); - bmWorkerWageCard.setBankName(worker.getBankName()); - bmWorkerWageCard.setBankBranchName(worker.getBankBranchName()); - bmWorkerWageCard.setBankIdentifierCode(worker.getBankIdentifierCode()); + bmWorkerWageCard.setWorkerId(export.getId()); + bmWorkerWageCard.setBankCardCode(export.getBankCardCode()); + bmWorkerWageCard.setBankName(export.getBankName()); + bmWorkerWageCard.setBankBranchName(export.getBankBranchName()); + bmWorkerWageCard.setBankIdentifierCode(export.getBankIdentifierCode()); insertWorkerWageCard(bmWorkerWageCard); //入场 importEinData(export); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml new file mode 100644 index 0000000..d437bed --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + +