From c58694b2b36934e666f8cce74e5f4a9a0fbbcd7f Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 10 Jul 2023 17:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=9B=BE=E8=B0=B1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD-=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/xmtp/controller/CreateTP.java | 37 +--- .../jeecg/modules/demo/xmtp/entity/Gxlx.java | 117 ------------- .../modules/demo/xmtp/entity/NodeName.java | 2 +- .../modules/demo/xmtp/entity/SkillType.java | 125 ------------- .../modules/demo/xmtp/entity/TaskSkill.java | 117 ------------- .../modules/demo/xmtp/entity/Tppronext.java | 165 ------------------ .../modules/demo/xmtp/mapper/YGxlxMapper.java | 18 -- .../demo/xmtp/mapper/YSkillTypeMapper.java | 18 -- .../demo/xmtp/mapper/YTaskSkillMapper.java | 18 -- .../demo/xmtp/mapper/YTppronextMapper.java | 18 -- .../demo/xmtp/mapper/xml/XmtpMapper.xml | 5 - .../demo/xmtp/service/TaskSkillService.java | 13 -- .../demo/xmtp/service/YGxlxService.java | 13 -- .../demo/xmtp/service/YSkillTypeService.java | 13 -- .../demo/xmtp/service/YTppronextService.java | 17 -- .../xmtp/service/impl/YGxlxServiceImpl.java | 22 --- .../service/impl/YSkillTypeServiceImpl.java | 22 --- .../service/impl/YTaskSkillServiceImpl.java | 22 --- .../service/impl/YTppronextServiceImpl.java | 32 ---- .../resources/mapper/SkillPointsMapper.xml | 30 ---- .../src/main/resources/mapper/YGxlxMapper.xml | 23 --- .../resources/mapper/YSkillTypeMapper.xml | 24 --- .../resources/mapper/YTaskSkillMapper.xml | 23 --- .../resources/mapper/YTppronextMapper.xml | 31 ---- 24 files changed, 8 insertions(+), 917 deletions(-) delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Gxlx.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/SkillType.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/TaskSkill.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Tppronext.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YGxlxMapper.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YSkillTypeMapper.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTaskSkillMapper.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTppronextMapper.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/xml/XmtpMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/TaskSkillService.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YGxlxService.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YSkillTypeService.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YTppronextService.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YGxlxServiceImpl.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YSkillTypeServiceImpl.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTaskSkillServiceImpl.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTppronextServiceImpl.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/SkillPointsMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YGxlxMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YSkillTypeMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTaskSkillMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTppronextMapper.xml diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/controller/CreateTP.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/controller/CreateTP.java index 767eff7..8860e72 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/controller/CreateTP.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/controller/CreateTP.java @@ -9,9 +9,13 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.demo.gxlx.entity.Gxlx; import org.jeecg.modules.demo.gxlx.service.IGxlxService; -import org.jeecg.modules.demo.xmtp.entity.*; +import org.jeecg.modules.demo.tppronext.entity.Tppronext; +import org.jeecg.modules.demo.tppronext.service.ITppronextService; +import org.jeecg.modules.demo.xmtp.entity.Exports; +import org.jeecg.modules.demo.xmtp.entity.NodeList; +import org.jeecg.modules.demo.xmtp.entity.NodeName; +import org.jeecg.modules.demo.xmtp.entity.Xmtp; import org.jeecg.modules.demo.xmtp.service.IXmtpService; -import org.jeecg.modules.demo.xmtp.service.YTppronextService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,7 +37,7 @@ public class CreateTP { private IXmtpService xmtpService; @Autowired - private YTppronextService tppronextService; + private ITppronextService tppronextService; @Autowired private IGxlxService gxlxService; @@ -79,9 +83,6 @@ public class CreateTP { nodeList.setValue(gxlx.getWidle().toString()); knowledgeRelationshipList.add(nodeList); }); -/* getAllSubKnowledgePoint(centerNode, - knowledgeList, - knowledgeRelationshipList);*/ Set knowledgeSet = new HashSet<>(knowledgeList); Set knowledgeRelationshipSet = new HashSet<>(knowledgeRelationshipList); // 封装最终结果 @@ -90,28 +91,4 @@ public class CreateTP { exports.setLinks(new ArrayList<>(knowledgeRelationshipSet)); return Result.OK(exports); } - -/* private void getAllSubKnowledgePoint(NodeName node, - List nameList, - List relationshipList) { - //查询指定知识点的所有后知识点 - List tppronextList = tppronextService.querySubKnowledgePoints(node); - if (tppronextList.size() > 0) { - tppronextList.forEach(tppronext -> { - //　构建知识点 - NodeName nodeName = new NodeName(); - nodeName.setName(tppronext.getHoupoint()); - nameList.add(nodeName); - // 构建知识点关系 - NodeList nodeList = new NodeList(); - nodeList.setSource(tppronext.getQianpoint()); - nodeList.setTarget(tppronext.getHoupoint()); - nodeList.setValue("1"); - relationshipList.add(nodeList); - getAllSubKnowledgePoint(nodeName, nameList, relationshipList); - }); - } - }*/ - - } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Gxlx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Gxlx.java deleted file mode 100644 index 21cee19..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Gxlx.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.jeecg.modules.demo.xmtp.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * - * @TableName gxlx - */ -@TableName(value ="gxlx") -@Data -public class Gxlx implements Serializable { - /** - * - */ - @TableId - private String id; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建日期 - */ - private Date createTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 更新日期 - */ - private Date updateTime; - - /** - * 所属部门 - */ - private String sysOrgCode; - - /** - * 关系名称 - */ - private String gxname; - - /** - * 权值 - */ - private Double widle; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - Gxlx other = (Gxlx) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) - && (this.getSysOrgCode() == null ? other.getSysOrgCode() == null : this.getSysOrgCode().equals(other.getSysOrgCode())) - && (this.getGxname() == null ? other.getGxname() == null : this.getGxname().equals(other.getGxname())) - && (this.getWidle() == null ? other.getWidle() == null : this.getWidle().equals(other.getWidle())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - result = prime * result + ((getSysOrgCode() == null) ? 0 : getSysOrgCode().hashCode()); - result = prime * result + ((getGxname() == null) ? 0 : getGxname().hashCode()); - result = prime * result + ((getWidle() == null) ? 0 : getWidle().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", sysOrgCode=").append(sysOrgCode); - sb.append(", gxname=").append(gxname); - sb.append(", widle=").append(widle); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/NodeName.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/NodeName.java index 3363393..eaa45e1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/NodeName.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/NodeName.java @@ -4,6 +4,6 @@ import lombok.Data; @Data public class NodeName { - private String name; + private String name; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/SkillType.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/SkillType.java deleted file mode 100644 index 1233467..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/SkillType.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.jeecg.modules.demo.xmtp.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * - * @TableName skill_type - */ -@TableName(value ="skill_type") -@Data -public class SkillType implements Serializable { - /** - * 主键 - */ - @TableId - private String id; - - /** - * 类型名称 - */ - private String typeName; - - /** - * 父类型id - */ - private String supertypeId; - - /** - * 描述 - */ - private String skillDesc; - - /** - * 图标 - */ - private String skillIcon; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 修改人 - */ - private String updateBy; - - /** - * 修改时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SkillType other = (SkillType) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getTypeName() == null ? other.getTypeName() == null : this.getTypeName().equals(other.getTypeName())) - && (this.getSupertypeId() == null ? other.getSupertypeId() == null : this.getSupertypeId().equals(other.getSupertypeId())) - && (this.getSkillDesc() == null ? other.getSkillDesc() == null : this.getSkillDesc().equals(other.getSkillDesc())) - && (this.getSkillIcon() == null ? other.getSkillIcon() == null : this.getSkillIcon().equals(other.getSkillIcon())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getTypeName() == null) ? 0 : getTypeName().hashCode()); - result = prime * result + ((getSupertypeId() == null) ? 0 : getSupertypeId().hashCode()); - result = prime * result + ((getSkillDesc() == null) ? 0 : getSkillDesc().hashCode()); - result = prime * result + ((getSkillIcon() == null) ? 0 : getSkillIcon().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", typeName=").append(typeName); - sb.append(", supertypeId=").append(supertypeId); - sb.append(", skillDesc=").append(skillDesc); - sb.append(", skillIcon=").append(skillIcon); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/TaskSkill.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/TaskSkill.java deleted file mode 100644 index cde5c03..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/TaskSkill.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.jeecg.modules.demo.xmtp.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * - * @TableName task_skill - */ -@TableName(value ="task_skill") -@Data -public class TaskSkill implements Serializable { - /** - * - */ - @TableId - private String id; - - /** - * 技能点id - */ - private String skillId; - - /** - * 任务类型 - */ - private Integer taskType; - - /** - * 任务id - */ - private String taskId; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 修改人 - */ - private String updateBy; - - /** - * 修改时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - TaskSkill other = (TaskSkill) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getSkillId() == null ? other.getSkillId() == null : this.getSkillId().equals(other.getSkillId())) - && (this.getTaskType() == null ? other.getTaskType() == null : this.getTaskType().equals(other.getTaskType())) - && (this.getTaskId() == null ? other.getTaskId() == null : this.getTaskId().equals(other.getTaskId())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getSkillId() == null) ? 0 : getSkillId().hashCode()); - result = prime * result + ((getTaskType() == null) ? 0 : getTaskType().hashCode()); - result = prime * result + ((getTaskId() == null) ? 0 : getTaskId().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", skillId=").append(skillId); - sb.append(", taskType=").append(taskType); - sb.append(", taskId=").append(taskId); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Tppronext.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Tppronext.java deleted file mode 100644 index 2d7c97a..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/entity/Tppronext.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.jeecg.modules.demo.xmtp.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * - * @TableName tppronext - */ -@TableName(value ="tppronext") -@Data -public class Tppronext implements Serializable { - /** - * 主键 - */ - @TableId - private String id; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建日期 - */ - private Date createTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 更新日期 - */ - private Date updateTime; - - /** - * 所属部门 - */ - private String sysOrgCode; - - /** - * 中心知识点 - */ - private String zxpoint; - - /** - * 前知识点 - */ - private String qianpoint; - - /** - * 前知识点来源 - */ - private String qianly; - - /** - * 后知识点 - */ - private String houpoint; - - /** - * 后知识点来源 - */ - private String houly; - - /** - * 知识点关系类型 - */ - private String zsdgx; - - /** - * 前知识点 - */ - private String temp1; - - /** - * 后知识点 - */ - private String temp2; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - Tppronext other = (Tppronext) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) - && (this.getSysOrgCode() == null ? other.getSysOrgCode() == null : this.getSysOrgCode().equals(other.getSysOrgCode())) - && (this.getZxpoint() == null ? other.getZxpoint() == null : this.getZxpoint().equals(other.getZxpoint())) - && (this.getQianpoint() == null ? other.getQianpoint() == null : this.getQianpoint().equals(other.getQianpoint())) - && (this.getQianly() == null ? other.getQianly() == null : this.getQianly().equals(other.getQianly())) - && (this.getHoupoint() == null ? other.getHoupoint() == null : this.getHoupoint().equals(other.getHoupoint())) - && (this.getHouly() == null ? other.getHouly() == null : this.getHouly().equals(other.getHouly())) - && (this.getZsdgx() == null ? other.getZsdgx() == null : this.getZsdgx().equals(other.getZsdgx())) - && (this.getTemp1() == null ? other.getTemp1() == null : this.getTemp1().equals(other.getTemp1())) - && (this.getTemp2() == null ? other.getTemp2() == null : this.getTemp2().equals(other.getTemp2())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - result = prime * result + ((getSysOrgCode() == null) ? 0 : getSysOrgCode().hashCode()); - result = prime * result + ((getZxpoint() == null) ? 0 : getZxpoint().hashCode()); - result = prime * result + ((getQianpoint() == null) ? 0 : getQianpoint().hashCode()); - result = prime * result + ((getQianly() == null) ? 0 : getQianly().hashCode()); - result = prime * result + ((getHoupoint() == null) ? 0 : getHoupoint().hashCode()); - result = prime * result + ((getHouly() == null) ? 0 : getHouly().hashCode()); - result = prime * result + ((getZsdgx() == null) ? 0 : getZsdgx().hashCode()); - result = prime * result + ((getTemp1() == null) ? 0 : getTemp1().hashCode()); - result = prime * result + ((getTemp2() == null) ? 0 : getTemp2().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", sysOrgCode=").append(sysOrgCode); - sb.append(", zxpoint=").append(zxpoint); - sb.append(", qianpoint=").append(qianpoint); - sb.append(", qianly=").append(qianly); - sb.append(", houpoint=").append(houpoint); - sb.append(", houly=").append(houly); - sb.append(", zsdgx=").append(zsdgx); - sb.append(", temp1=").append(temp1); - sb.append(", temp2=").append(temp2); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YGxlxMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YGxlxMapper.java deleted file mode 100644 index 6a52749..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YGxlxMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.xmtp.mapper; - -import org.jeecg.modules.demo.xmtp.entity.Gxlx; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author You do -* @description 针对表【gxlx】的数据库操作Mapper -* @createDate 2023-06-30 15:57:18 -* @Entity org.jeecg.modules.demo.xmtp.entity.Gxlx -*/ -public interface YGxlxMapper extends BaseMapper { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YSkillTypeMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YSkillTypeMapper.java deleted file mode 100644 index add2b92..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YSkillTypeMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.xmtp.mapper; - -import org.jeecg.modules.demo.xmtp.entity.SkillType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author You do -* @description 针对表【skill_type】的数据库操作Mapper -* @createDate 2023-06-30 15:58:43 -* @Entity org.jeecg.modules.demo.xmtp.entity.SkillType -*/ -public interface YSkillTypeMapper extends BaseMapper { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTaskSkillMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTaskSkillMapper.java deleted file mode 100644 index 13c17fd..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTaskSkillMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.xmtp.mapper; - -import org.jeecg.modules.demo.xmtp.entity.TaskSkill; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author You do -* @description 针对表【task_skill】的数据库操作Mapper -* @createDate 2023-06-30 15:56:39 -* @Entity org.jeecg.modules.demo.xmtp.entity.TaskSkill -*/ -public interface YTaskSkillMapper extends BaseMapper { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTppronextMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTppronextMapper.java deleted file mode 100644 index 11e187a..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/YTppronextMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.xmtp.mapper; - -import org.jeecg.modules.demo.xmtp.entity.Tppronext; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author You do -* @description 针对表【tppronext】的数据库操作Mapper -* @createDate 2023-06-30 15:56:07 -* @Entity org.jeecg.modules.demo.xmtp.entity.Tppronext -*/ -public interface YTppronextMapper extends BaseMapper { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/xml/XmtpMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/xml/XmtpMapper.xml deleted file mode 100644 index 2690a52..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/mapper/xml/XmtpMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/TaskSkillService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/TaskSkillService.java deleted file mode 100644 index df37658..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/TaskSkillService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service; - -import org.jeecg.modules.demo.xmtp.entity.TaskSkill; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author You do -* @description 针对表【task_skill】的数据库操作Service -* @createDate 2023-06-30 15:56:39 -*/ -public interface TaskSkillService extends IService { - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YGxlxService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YGxlxService.java deleted file mode 100644 index dcdc476..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YGxlxService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service; - -import org.jeecg.modules.demo.xmtp.entity.Gxlx; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author You do -* @description 针对表【gxlx】的数据库操作Service -* @createDate 2023-06-30 15:57:18 -*/ -public interface YGxlxService extends IService { - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YSkillTypeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YSkillTypeService.java deleted file mode 100644 index 168b59f..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YSkillTypeService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service; - -import org.jeecg.modules.demo.xmtp.entity.SkillType; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author You do -* @description 针对表【skill_type】的数据库操作Service -* @createDate 2023-06-30 15:58:43 -*/ -public interface YSkillTypeService extends IService { - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YTppronextService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YTppronextService.java deleted file mode 100644 index ee0c0ae..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/YTppronextService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service; - -import org.jeecg.modules.demo.xmtp.entity.NodeName; -import org.jeecg.modules.demo.xmtp.entity.Tppronext; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** -* @author You do -* @description 针对表【tppronext】的数据库操作Service -* @createDate 2023-06-30 15:56:07 -*/ -public interface YTppronextService extends IService { - - List querySubKnowledgePoints(NodeName centerNode); -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YGxlxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YGxlxServiceImpl.java deleted file mode 100644 index 5d9e55d..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YGxlxServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.demo.xmtp.entity.Gxlx; -import org.jeecg.modules.demo.xmtp.mapper.YGxlxMapper; -import org.jeecg.modules.demo.xmtp.service.YGxlxService; -import org.springframework.stereotype.Service; - -/** -* @author You do -* @description 针对表【gxlx】的数据库操作Service实现 -* @createDate 2023-06-30 15:57:18 -*/ -@Service -public class YGxlxServiceImpl extends ServiceImpl - implements YGxlxService { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YSkillTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YSkillTypeServiceImpl.java deleted file mode 100644 index 285f427..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YSkillTypeServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.demo.xmtp.entity.SkillType; -import org.jeecg.modules.demo.xmtp.service.YSkillTypeService; -import org.jeecg.modules.demo.xmtp.mapper.YSkillTypeMapper; -import org.springframework.stereotype.Service; - -/** -* @author You do -* @description 针对表【skill_type】的数据库操作Service实现 -* @createDate 2023-06-30 15:58:43 -*/ -@Service -public class YSkillTypeServiceImpl extends ServiceImpl - implements YSkillTypeService { - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTaskSkillServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTaskSkillServiceImpl.java deleted file mode 100644 index d520bf8..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTaskSkillServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.demo.xmtp.entity.TaskSkill; -import org.jeecg.modules.demo.xmtp.service.TaskSkillService; -import org.jeecg.modules.demo.xmtp.mapper.YTaskSkillMapper; -import org.springframework.stereotype.Service; - -/** -* @author You do -* @description 针对表【task_skill】的数据库操作Service实现 -* @createDate 2023-06-30 15:56:39 -*/ -@Service -public class YTaskSkillServiceImpl extends ServiceImpl - implements TaskSkillService{ - -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTppronextServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTppronextServiceImpl.java deleted file mode 100644 index e6fdc82..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/xmtp/service/impl/YTppronextServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.jeecg.modules.demo.xmtp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.demo.xmtp.entity.NodeName; -import org.jeecg.modules.demo.xmtp.entity.Tppronext; -import org.jeecg.modules.demo.xmtp.service.YTppronextService; -import org.jeecg.modules.demo.xmtp.mapper.YTppronextMapper; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author You do - * @description 针对表【tppronext】的数据库操作Service实现 - * @createDate 2023-06-30 15:56:07 - */ -@Service -public class YTppronextServiceImpl extends ServiceImpl - implements YTppronextService { - - @Override - public List querySubKnowledgePoints(NodeName centerNode) { - LambdaQueryWrapper tppronextWrapper = new LambdaQueryWrapper<>(); - tppronextWrapper.eq(Tppronext::getQianpoint, centerNode.getName()); - return this.list(tppronextWrapper); - } -} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/SkillPointsMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/SkillPointsMapper.xml deleted file mode 100644 index e0f70ed..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/SkillPointsMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id,skill_code,skill_type, - skill_name,skill_level,skill_desc, - skill_icon,skill_pic,skill_status, - create_by,create_time,update_by, - update_time - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YGxlxMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YGxlxMapper.xml deleted file mode 100644 index 54d65b6..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YGxlxMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,sys_org_code, - gxname,widle - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YSkillTypeMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YSkillTypeMapper.xml deleted file mode 100644 index 450f037..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YSkillTypeMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - id,type_name,supertype_id, - skill_desc,skill_icon,create_by, - create_time,update_by,update_time - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTaskSkillMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTaskSkillMapper.xml deleted file mode 100644 index 0e99e79..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTaskSkillMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - id,skill_id,task_type, - task_id,create_by,create_time, - update_by,update_time - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTppronextMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTppronextMapper.xml deleted file mode 100644 index 4b4ec72..0000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/mapper/YTppronextMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,sys_org_code, - zxpoint,qianpoint,qianly, - houpoint,houly,zsdgx, - temp1,temp2 - -