模型、服务、审核发布

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

@@ -52,6 +52,9 @@ public class PtServiceController extends BaseController {
     @Autowired
     private IPtServiceRunLogService serviceRunLogService;
 
+    @Autowired
+    private IMdModelInfoService  mdModelInfoService;
+
     @Autowired
     private SM4Util sm4Util;
 
@@ -66,7 +69,21 @@ public class PtServiceController extends BaseController {
         ptService.setMaintainContacer(sm4Util.encrypt(ptService.getMaintainContacer()));
         ptService.setAdName(sm4Util.encrypt(ptService.getAdName()));
 
+        ptService.setAudit("0");
+        ptService.setPublish("0");
+
         boolean save = ptServiceService.save(ptService);
+
+        MdModelInfo mdModelInfo = mdModelInfoService.selectMdModelInfoByMdid(ptService.getMdid());
+        if ("1".equals(mdModelInfo.getAudit())){ //模型以审核通过
+            mdModelInfo.setAudit("3");
+            mdModelInfoService.audit(mdModelInfo);
+        }
+        if ("1".equals(mdModelInfo.getPublish())){ //模型以审核通过
+            mdModelInfo.setPublish("3");
+            mdModelInfoService.publish(mdModelInfo);
+        }
+
         if (save) {
             return AjaxResult.success(ptService);
 
@@ -209,6 +226,22 @@ public class PtServiceController extends BaseController {
         ptService.setMaintainContacer(sm4Util.encrypt(ptService.getMaintainContacer()));
         ptService.setAdName(sm4Util.encrypt(ptService.getAdName()));
 
+
+        boolean save = ptServiceService.save(ptService);
+
+        MdModelInfo mdModelInfo = mdModelInfoService.selectMdModelInfoByMdid(ptService.getMdid());
+
+
+        if ("1".equals(mdModelInfo.getAudit())){ //模型以审核通过
+            mdModelInfo.setAudit("3");
+            mdModelInfoService.audit(mdModelInfo);
+        }
+        if ("1".equals(mdModelInfo.getPublish())){ //模型以审核通过
+            mdModelInfo.setPublish("3");
+            mdModelInfoService.publish(mdModelInfo);
+        }
+
+
         return AjaxResult.success(ptServiceService.put(ptService));
     }
 

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

@@ -369,7 +369,7 @@ public class MdModelInfo extends BaseEntity {
 
     /**
      * 审核状态
-     * 审核状态 0=待审核；1=已审核；2 = 驳回
+     * 审核状态 0=待审核；1=已审核；2 = 驳回 ；3=更新审核
      */
     private String audit;
     private String auditBy;

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

@@ -57,7 +57,7 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     @Override
     public List<MdModelInfo> selectMdModelInfoList(MdModelInfo mdModelInfo) {
         List<MdModelInfo> mdModelInfos = mdModelInfoMapper.selectMdModelInfoList(mdModelInfo);
-        mdModelInfos.forEach(p->{
+        mdModelInfos.forEach(p -> {
             p.setMdContact(sm4Util.decrypt(p.getMdContact()));
             p.setDevContact(sm4Util.decrypt(p.getDevContact()));
 
@@ -121,15 +121,18 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
 
     @Autowired
     private PtServiceService ptServiceService;
+
     @Override
     public int publish(MdModelInfo 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);
+        if ("1".equals(mdModelInfo.getPublish())) {
+            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;
     }