模型审核发布

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.interfaces.domain.MdAudit;
 import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.vo.MdModelSetRelaVo;
 import com.ruoyi.interfaces.service.IMdAuditService;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
@@ -131,9 +132,56 @@ public class MdModelInfoController extends BaseController {
         return toAjax(mdModelInfoService.modelSetRela(modelSet));
     }
 
+    /**
+     * 删除模型关联数据集关系
+     *
+     * @param modelSet
+     * @return
+     */
     @DeleteMapping("/modelSetRela")
     public AjaxResult deleteModelSetRela(MdModelSetRelaVo modelSet) {
         return toAjax(mdModelInfoService.deleteModelSetRela(modelSet));
     }
 
-}
+
+    @Autowired
+    private IMdAuditService mdAuditService;
+
+    /**
+     * 模型审核接口
+     *
+     * @param modelInfo
+     * @return
+     */
+    @GetMapping("/audit")
+    public AjaxResult audit(MdModelInfo modelInfo) {
+        Date nowDate = DateUtils.getNowDate();
+        if (org.apache.commons.lang3.StringUtils.isEmpty(modelInfo.getMdid())) {
+            return error("模型id不可为空");
+        }
+        MdAudit audit = new MdAudit(null, modelInfo.getMdid(), "AUDIT", modelInfo.getAudit(), getUsername(), nowDate, modelInfo.getAuditRemark());
+        int i = mdAuditService.insertMdAudit(audit);
+        modelInfo.setAuditBy(getUsername());
+        modelInfo.setAuditTime(nowDate);
+        return success(mdModelInfoService.audit(modelInfo));
+    }
+
+
+    /**
+     * 模型发布接口
+     *
+     * @param modelInfo
+     * @return
+     */
+    @GetMapping("/publish")
+    public AjaxResult publish(MdModelInfo modelInfo) {
+        Date nowDate = DateUtils.getNowDate();
+        MdAudit audit = new MdAudit(null, modelInfo.getMdid(), "PUBLISH", modelInfo.getPublish(), getUsername(), nowDate, modelInfo.getAuditRemark());
+        int i = mdAuditService.insertMdAudit(audit);
+        modelInfo.setPublishBy(getUsername());
+        modelInfo.setPublishTime(DateUtils.getNowDate());
+        return success(mdModelInfoService.publish(modelInfo));
+    }
+
+
+}

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

@@ -28,9 +28,11 @@ public class MdAudit extends BaseEntity {
     private String proId;
 
     /**
-     * 所属项目（md=模型；srv=服务）
+     * AUDIT = 审核；
+     *
+     * 所属项目
      */
-    @Excel(name = "所属项目", readConverterExp = "m=d=模型；srv=服务")
+    @Excel(name = "所属项目")
     private String proType;
 
     /**

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

@@ -5,8 +5,12 @@ import lombok.Data;
 
 @Data
 public class MdEstimateFirmlyVo extends MdEstimateFirmly {
+
     private String mdid;
+
     private String mdName;
+
     private String devkind;
+
     private Integer estimateNum;
 }

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

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

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

@@ -47,4 +47,6 @@ public interface PtServiceService extends IService<PtService> {
     int audit(PtService service);
 
     int publish(PtService service);
+
+    int publishByMdid(PtService mdid);
 }

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

@@ -7,10 +7,12 @@ import com.ruoyi.common.utils.SM4Util;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.vo.MdModelSetRelaVo;
 import com.ruoyi.interfaces.mapper.MdModelInfoMapper;
 import com.ruoyi.interfaces.service.IMdModelFileService;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
+import com.ruoyi.interfaces.service.PtServiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -117,9 +119,18 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
         return mdModelInfoMapper.updateMdModelInfoAudit(mdModelInfo);
     }
 
+    @Autowired
+    private PtServiceService ptServiceService;
     @Override
     public int publish(MdModelInfo mdModelInfo) {
-        return mdModelInfoMapper.updateMdModelInfoPublish(mdModelInfo);
+        int i = mdModelInfoMapper.updateMdModelInfoPublish(mdModelInfo);
+        PtService ptService = new PtService();
+        ptService.setMdid(mdModelInfo.getMdid());
+        ptService.setPublishBy(mdModelInfo.getPublishBy());
+        ptService.setPublishTime(DateUtils.getNowDate());
+        ptService.setPublish(mdModelInfo.getPublish());
+        ptServiceService.publishByMdid(ptService);
+        return i;
     }
 
     @Override

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

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

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

@@ -463,6 +463,13 @@ PUBLISH_TIME
             PUBLISH_TIME = #{publishTime}
         where SRV_ID = #{srvId}
     </update>
+    <update id="updatePtServicePublishByMdid">
+        update PT_SERVICE
+        set PUBLISH      = #{publish},
+            PUBLISH_BY   = #{publishBy},
+            PUBLISH_TIME = #{publishTime}
+        where mdid = #{mdid}
+    </update>
 
     <!--根据主键删除数据-->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">