Browse Source

添加业务对象获取模板

wukai 11 months ago
parent
commit
d305d9e7dc

+ 5 - 0
jjt-biz/src/main/java/com/jjt/biz/domain/BizObj.java

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 业务对象对象 biz_obj
  *
@@ -62,4 +64,7 @@ public class BizObj extends BaseEntity {
 
     @ApiModelProperty("系统压力")
     private Integer accessTimes;
+
+    @ApiModelProperty("模板列表")
+    private List<BizObjTpl> tplList;
 }

+ 17 - 49
jjt-biz/src/main/java/com/jjt/biz/domain/BizObjTpl.java

@@ -1,12 +1,13 @@
 package com.jjt.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.jjt.common.annotation.Excel;
+import com.jjt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.jjt.common.annotation.Excel;
-import com.jjt.common.core.domain.BaseEntity;
 
 /**
  * 业务对象模板应用对象 biz_obj_tpl
@@ -15,64 +16,31 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-08-09
  */
 @ApiModel(value = "BizObjTpl", description = "业务对象模板应用")
-public class BizObjTpl extends BaseEntity
-{
+@Data
+public class BizObjTpl extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 模板应用ID */
+    /**
+     * 模板应用ID
+     */
     @ApiModelProperty("模板应用ID")
     @TableId
     private Long objTplId;
 
-    /** 业务对象ID */
+    @ApiModelProperty("模板名称")
+    private String tplName;
+
+    /**
+     * 业务对象ID
+     */
     @ApiModelProperty("业务对象ID")
     @Excel(name = "业务对象ID")
     private Long objId;
 
-    /** 模板ID */
+    /**
+     * 模板ID
+     */
     @ApiModelProperty("模板ID")
     @Excel(name = "模板ID")
     private Long tplId;
-
-    public void setObjTplId(Long objTplId)
-    {
-        this.objTplId = objTplId;
-    }
-
-    public Long getObjTplId()
-    {
-        return objTplId;
-    }
-    public void setObjId(Long objId)
-    {
-        this.objId = objId;
-    }
-
-    public Long getObjId()
-    {
-        return objId;
-    }
-    public void setTplId(Long tplId)
-    {
-        this.tplId = tplId;
-    }
-
-    public Long getTplId()
-    {
-        return tplId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objTplId", getObjTplId())
-            .append("objId", getObjId())
-            .append("tplId", getTplId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

+ 19 - 8
jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjServiceImpl.java

@@ -1,12 +1,15 @@
 package com.jjt.biz.service.impl;
 
-import java.util.List;
-        import com.jjt.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.jjt.biz.mapper.BizObjMapper;
 import com.jjt.biz.domain.BizObj;
+import com.jjt.biz.domain.BizObjTpl;
+import com.jjt.biz.mapper.BizObjMapper;
 import com.jjt.biz.service.IBizObjService;
+import com.jjt.biz.service.IBizObjTplService;
+import com.jjt.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 业务对象Service业务层处理
@@ -18,6 +21,8 @@ import javax.annotation.Resource;
 public class BizObjServiceImpl implements IBizObjService {
     @Resource
     private BizObjMapper bizObjMapper;
+    @Resource
+    private IBizObjTplService objTplService;
 
     /**
      * 查询业务对象
@@ -38,7 +43,13 @@ public class BizObjServiceImpl implements IBizObjService {
      */
     @Override
     public List<BizObj> selectBizObjList(BizObj bizObj) {
-        return bizObjMapper.selectBizObjList(bizObj);
+        List<BizObj> list = bizObjMapper.selectBizObjList(bizObj);
+        list.forEach(obj -> {
+            BizObjTpl tpl = new BizObjTpl();
+            tpl.setObjId(obj.getObjId());
+            obj.setTplList(objTplService.selectBizObjTplList(tpl));
+        });
+        return list;
     }
 
     /**
@@ -49,8 +60,8 @@ public class BizObjServiceImpl implements IBizObjService {
      */
     @Override
     public int insertBizObj(BizObj bizObj) {
-                bizObj.setCreateTime(DateUtils.getNowDate());
-            return bizObjMapper.insertBizObj(bizObj);
+        bizObj.setCreateTime(DateUtils.getNowDate());
+        return bizObjMapper.insertBizObj(bizObj);
     }
 
     /**
@@ -61,7 +72,7 @@ public class BizObjServiceImpl implements IBizObjService {
      */
     @Override
     public int updateBizObj(BizObj bizObj) {
-                bizObj.setUpdateTime(DateUtils.getNowDate());
+        bizObj.setUpdateTime(DateUtils.getNowDate());
         return bizObjMapper.updateBizObj(bizObj);
     }
 

+ 6 - 3
jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjTplServiceImpl.java

@@ -133,9 +133,12 @@ public class BizObjTplServiceImpl implements IBizObjTplService {
             BizObjTpl bizObjTpl = new BizObjTpl();
             bizObjTpl.setTplId(tplId);
             bizObjTpl.setObjId(objId);
-
-            insertBizObjTpl(bizObjTpl);
-            metricsService.insertBatch(objId, tplId);
+            List list = selectBizObjTplList(bizObjTpl);
+            if (list.size() == 0) {
+                //防止重复添加
+                insertBizObjTpl(bizObjTpl);
+                metricsService.insertBatch(objId, tplId);
+            }
         }
         return 0;
     }

+ 14 - 9
jjt-biz/src/main/resources/mapper/obj/BizObjTplMapper.xml

@@ -8,6 +8,7 @@
         <result property="objTplId" column="OBJ_TPL_ID"/>
         <result property="objId" column="OBJ_ID"/>
         <result property="tplId" column="TPL_ID"/>
+        <result property="tplName" column="TPL_NAME"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -16,15 +17,19 @@
     </resultMap>
 
     <sql id="selectBizObjTplVo">
-        select OBJ_TPL_ID,
-               OBJ_ID,
-               TPL_ID,
-               CREATE_BY,
-               CREATE_TIME,
-               UPDATE_BY,
-               UPDATE_TIME,
-               REMARK
-        from biz_obj_tpl
+        select *
+        from (select a.OBJ_TPL_ID,
+                     a.OBJ_ID,
+                     a.TPL_ID,
+                     b.tpl_name,
+                     a.CREATE_BY,
+                     a.CREATE_TIME,
+                     a.UPDATE_BY,
+                     a.UPDATE_TIME,
+                     a.REMARK
+              from biz_obj_tpl a,
+                   METRICS_TPL b
+              where a.tpl_id = b.tpl_id) t
     </sql>
 
     <select id="selectBizObjTplList" parameterType="BizObjTpl" resultMap="BizObjTplResult">