Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelInfoController.java

@@ -120,11 +120,17 @@ public class MdModelInfoController extends BaseController {
     @GetMapping("/audit")
     public AjaxResult audit(MdModelInfo mdModelInfo) {
         Date nowDate = DateUtils.getNowDate();
-        MdAudit srv = new MdAudit(null, mdModelInfo.getMdid(), "SRV", mdModelInfo.getAudit(), getUsername(), nowDate, mdModelInfo.getAuditRemark());
+        MdAudit srv = new MdAudit(null, mdModelInfo.getMdid(), "MD", mdModelInfo.getAudit(), getUsername(), nowDate, mdModelInfo.getAuditRemark());
         int i = mdAuditService.insertMdAudit(srv);
         mdModelInfo.setAuditBy(getUsername());
         mdModelInfo.setAuditTime(nowDate);
         return success(mdModelInfoService.audit(mdModelInfo));
     }
 
+    @GetMapping("/publish")
+    public AjaxResult publish(MdModelInfo mdModelInfo) {
+        mdModelInfo.setPublishBy(getUsername());
+        mdModelInfo.setPublishTime(DateUtils.getNowDate());
+        return success(mdModelInfoService.publish(mdModelInfo));
+    }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtServiceController.java

@@ -218,4 +218,12 @@ public class PtServiceController extends BaseController {
         return success(ptServiceService.audit(service));
     }
 
+    @GetMapping("/publish")
+    public AjaxResult publish(PtService service) {
+        service.setPublishBy(getUsername());
+        service.setPublishTime(DateUtils.getNowDate());
+        return success(ptServiceService.publish(service));
+    }
+
+
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdModelInfo.java

@@ -376,6 +376,37 @@ public class MdModelInfo extends BaseEntity {
     private Date auditTime;
     private String auditRemark;
 
+    /**
+     * 发布操作
+     */
+    private String publish;
+    private String publishBy;
+    private Date publishTime;
+
+    public String getPublish() {
+        return publish;
+    }
+
+    public void setPublish(String publish) {
+        this.publish = publish;
+    }
+
+    public String getPublishBy() {
+        return publishBy;
+    }
+
+    public void setPublishBy(String publishBy) {
+        this.publishBy = publishBy;
+    }
+
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
+
     public String getAuditBy() {
         return auditBy;
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/PtService.java

@@ -130,5 +130,8 @@ public class PtService implements Serializable {
     private String auditRemark;
     private Date auditTime;
 
+    private String publish;
+    private String publishBy;
+    private Date publishTime;
 
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdModelInfoMapper.java

@@ -65,4 +65,6 @@ public interface MdModelInfoMapper
     public int deleteMdModelInfoByMdids(String[] mdids);
 
     int updateMdModelInfoAudit(MdModelInfo mdModelInfo);
+
+    int updateMdModelInfoPublish(MdModelInfo mdModelInfo);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/PtServiceMapper.java

@@ -70,6 +70,8 @@ public interface PtServiceMapper extends BaseMapper<PtService> {
 
     int audit(PtService service);
 
+    int updatePtServicePublish(PtService service);
+
  /*   int insertSelective(PtServiceWithBLOBs record);
 
     PtServiceWithBLOBs selectByPrimaryKey(String srvId);

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdModelInfoService.java

@@ -61,4 +61,6 @@ public interface IMdModelInfoService
     public int deleteMdModelInfoByMdid(String mdid);
 
     int audit(MdModelInfo mdModelInfo);
+
+    int publish(MdModelInfo mdModelInfo);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/PtServiceService.java

@@ -44,4 +44,6 @@ public interface PtServiceService extends IService<PtService> {
     String testRun(PtService ptService) throws IOException;
 
     int audit(PtService service);
+
+    int publish(PtService service);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelInfoServiceImpl.java

@@ -110,4 +110,9 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService
 
         return mdModelInfoMapper.updateMdModelInfoAudit(mdModelInfo);
     }
+
+    @Override
+    public int publish(MdModelInfo mdModelInfo) {
+        return mdModelInfoMapper.updateMdModelInfoPublish(mdModelInfo);
+    }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -173,6 +173,11 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         return ptServiceMapper.audit(service);
     }
 
+    @Override
+    public int publish(PtService service) {
+        return ptServiceMapper.updatePtServicePublish(service);
+    }
+
     public void senServiceLog(){
 
 

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdModelInfoMapper.xml

@@ -69,6 +69,9 @@
         <result property="auditBy" column="AUDIT_BY"/>
         <result property="auditTime" column="AUDIT_TIME"/>
         <result property="auditRemark" column="AUDIT_REMARK"/>
+        <result property="publish" column="PUBLISH"/>
+        <result property="publishBy" column="PUBLISH_BY"/>
+        <result property="publishTime" column="PUBLISH_TIME"/>
     </resultMap>
 
     <sql id="selectMdModelInfoVo">
@@ -135,7 +138,10 @@
                AUDIT,
                AUDIT_BY,
                AUDIT_TIME,
-               AUDIT_REMARK
+               AUDIT_REMARK,
+               PUBLISH,
+               PUBLISH_BY,
+               PUBLISH_TIME
         from md_model_info
     </sql>
 
@@ -208,6 +214,9 @@
             <if test="regUser != null  and regUser != ''">and REG_USER = #{regUser}</if>
             <if test="sort != null  and sort != ''">and SORT = #{sort}</if>
             <if test="audit != null  and audit != ''">and AUDIT = #{audit}</if>
+            <if test="publish != null and publish != ''">
+                and PUBLISH = #{publish}
+            </if>
         </where>
         order by SORT
     </select>
@@ -421,6 +430,14 @@
         where MDID =
               #{mdid}
     </update>
+    <update id="updateMdModelInfoPublish">
+        UPDATE md_model_info
+        SET PUBLISH      = #{publish},
+            PUBLISH_BY   = #{publishBy},
+            PUBLISH_TIME = #{publishTime}
+        where MDID =
+              #{mdid}
+    </update>
 
     <delete id="deleteMdModelInfoByMdid" parameterType="String">
         delete

ruoyi-api-patform/src/main/resources/mapper/interfaces/PtServiceMapper.xml

@@ -43,6 +43,9 @@
         <result column="AUDIT_BY" property="auditBy" jdbcType="VARCHAR"/>
         <result column="AUDIT_TIME" property="auditTime"/>
         <result column="AUDIT_REMARK" property="auditRemark" jdbcType="VARCHAR"/>
+        <result column="PUBLISH" property="publish" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_BY" property="publishBy" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_TIME" property="publishTime" />
     </resultMap>
     <resultMap id="AuthVoResultMap" type="com.ruoyi.interfaces.domain.vo.PtServiceVo">
         <result property="id" jdbcType="VARCHAR" column="ID"/>
@@ -86,8 +89,11 @@
         <result column="DATA_NUM" property="dataNum" jdbcType="INTEGER"/>
         <result column="AUDIT" property="audit" jdbcType="VARCHAR"/>
         <result column="AUDIT_BY" property="auditBy" jdbcType="VARCHAR"/>
-        <result column="AUDIT_TIME" property="auditTime" jdbcType="VARCHAR"/>
+        <result column="AUDIT_TIME" property="auditTime" />
         <result column="AUDIT_REMARK" property="auditRemark" jdbcType="VARCHAR"/>
+        <result column="PUBLISH" property="publish" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_BY" property="publishBy" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_TIME" property="publishTime" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -100,7 +106,10 @@
     TM, RELEASE_TIME, RLSTM, UPTM,
     VIEW_NUM, CNT, APPLY_NUM, DATA_NUM,AUDIT,AUDIT_BY,
 AUDIT_TIME,
-AUDIT_REMARK
+AUDIT_REMARK,
+        PUBLISH,
+PUBLISH_BY,
+PUBLISH_TIME
     </sql>
     <sql id="Blob_Column_List">
         RPCONTENT
@@ -111,7 +120,10 @@ AUDIT_REMARK
         , NAME, TYPE, INTRO, URL, RQTYPE, RPTYPE, STATUS, CNT, USER_ID, TM,PROXY_ADDRESS,PROXY_PATH,SERVICE_SOURCE,CATE_CODE,
     SERVICE_DEPT, MANAGE_NAME,RELEASE_TIME,DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,VIEW_NUM,AUDIT,AUDIT_BY,
 AUDIT_TIME,
-AUDIT_REMARK
+AUDIT_REMARK,
+        PUBLISH,
+PUBLISH_BY,
+PUBLISH_TIME
     </sql>
     <sql id="table_columns">
         MDID
@@ -152,7 +164,10 @@ AUDIT_REMARK
             MAINTAIN_CONTACER,
             VIEW_NUM,SORT,AUDIT,AUDIT_BY,
 AUDIT_TIME,
-AUDIT_REMARK
+AUDIT_REMARK,
+        PUBLISH,
+PUBLISH_BY,
+PUBLISH_TIME
     </sql>
     <sql id="entity_properties">
         #{mdid,jdbcType=VARCHAR}
@@ -308,6 +323,9 @@ AUDIT_REMARK
             <if test="audit != null and audit != ''">
                 and AUDIT = #{audit}
             </if>
+            <if test="publish != null and publish != ''">
+                and PUBLISH = #{publish}
+            </if>
         </trim>
     </sql>
 
@@ -431,6 +449,13 @@ order by SORT
             AUDIT_REMARK = #{auditRemark}
         where SRV_ID = #{srvId}
     </update>
+    <update id="updatePtServicePublish">
+        update PT_SERVICE
+        set PUBLISH      = #{publish},
+            PUBLISH_BY   = #{publishBy},
+            PUBLISH_TIME = #{publishTime}
+        where SRV_ID = #{srvId}
+    </update>
 
     <!--根据主键删除数据-->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">