模型、服务、审核发布

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

@@ -49,7 +49,7 @@ public class MdCatalogController extends BaseController {
     public AjaxResult edit(@RequestBody MdCatalog catalog)
     {
         Integer catalogId = catalog.getCatalogId();
-        if (catalog.getParentId().equals(catalogId))
+        if (StringUtils.isNotNull(catalog.getParentId()) && catalog.getParentId().equals(catalogId))
         {
             return error("修改目录'" + catalog.getCatalogName() + "'失败，上级目录不能是自己");
         }

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

@@ -121,6 +121,7 @@ public class PtServiceController extends BaseController {
      */
     @GetMapping("/modelService")
     public AjaxResult modelService(MdModelInfoVo par) {
+        if (par.getMdid() == null) return error("模型id不可为空");
         return AjaxResult.success(ptServiceService.modelService(par));
     }
 
@@ -190,6 +191,11 @@ public class PtServiceController extends BaseController {
         return PageUtils.convert(pageInfo);
     }
 
+    @GetMapping("/state")
+    public AjaxResult state(PtService service){
+        return success(ptServiceService.state(service));
+    }
+
     @ApiOperation("根据主键获取数据")
     @PostMapping(value = "/list")
     public Page list(@RequestBody PageParam<PtService> ptServicePage) {

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

@@ -115,6 +115,11 @@ public class PtService implements Serializable {
     @ApiModelProperty("请求参数列表")
     private List<PtServiceParam> params;
 
+    /**
+     * 模型状态
+     */
+    private String state;
+
     public PtService(String mdid) {
         this.mdid = mdid;
     }

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

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

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

@@ -1,6 +1,7 @@
 package com.ruoyi.interfaces.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.interfaces.domain.MdModelInfo;
 import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
@@ -49,4 +50,6 @@ public interface PtServiceService extends IService<PtService> {
     int publish(PtService service);
 
     int publishByMdid(PtService mdid);
+
+    int state(PtService service);
 }

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

@@ -128,6 +128,8 @@ public class MdEstimateFirmlyServiceImpl implements IMdEstimateFirmlyService {
         } else {
             mdEstimateFirmly.setCreateBy(estimateFirmly.getCreateBy());
             mdEstimateFirmly.setCreateTime(estimateFirmly.getCreateTime());
+            mdEstimateFirmly.setFirmlyConfirm(estimateFirmly.getFirmlyConfirm());
+            mdEstimateFirmly.setFirmlyState("1");
             mdEstimateFirmlyMapper.updateMdEstimateFirmly(mdEstimateFirmly);
         }
         return "认定成功";

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

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

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

@@ -46,6 +46,7 @@
         <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="state" property="state" jdbcType="VARCHAR"/>
         <result column="PUBLISH_TIME" property="publishTime"/>
     </resultMap>
     <resultMap id="AuthVoResultMap" type="com.ruoyi.interfaces.domain.vo.PtServiceVo">
@@ -71,6 +72,7 @@
         <result column="PROXY_ADDRESS" jdbcType="VARCHAR" property="proxyAddress"/>
         <result column="PROXY_PATH" jdbcType="VARCHAR" property="proxyPath"/>
         <result column="gateway_id" jdbcType="VARCHAR" property="gatewayId"/>
+        <result column="state" jdbcType="VARCHAR" property="state"/>
         <result column="SERVICE_SOURCE" jdbcType="VARCHAR" property="serviceSource"/>
         <result property="serviceDept" column="SERVICE_DEPT" jdbcType="VARCHAR"/>
         <result property="manageName" column="MANAGE_NAME" jdbcType="VARCHAR"/>
@@ -112,7 +114,8 @@ AUDIT_REMARK,
         PUBLISH,
 PUBLISH_BY,
 PUBLISH_TIME,
-        GATEWAY_ID
+        GATEWAY_ID,
+        state
     </sql>
     <sql id="Blob_Column_List">
         RPCONTENT
@@ -127,7 +130,8 @@ AUDIT_REMARK,
         PUBLISH,
 PUBLISH_BY,
 PUBLISH_TIME
-        ,GATEWAY_ID
+        ,GATEWAY_ID,
+        state
     </sql>
     <sql id="table_columns">
         MDID
@@ -175,7 +179,8 @@ PUBLISH_TIME
             PUBLISH,
             PUBLISH_BY,
             PUBLISH_TIME,
-        GATEWAY_ID
+        GATEWAY_ID,
+        state
     </sql>
     <sql id="entity_properties">
         #{mdid,jdbcType=VARCHAR},
@@ -310,6 +315,8 @@ PUBLISH_TIME
             </if>
             <if test="gatewayId != null and gatewayId != ''">
                 and gateway_id = #{gatewayId}
+            </if> <if test="state != null and state != ''">
+                and state = #{state}
             </if>
             <if test="serviceSource != null and serviceSource != ''">
                 and SERVICE_SOURCE = #{serviceSource}
@@ -481,6 +488,11 @@ PUBLISH_TIME
             PUBLISH_TIME = #{publishTime}
         where mdid = #{mdid}
     </update>
+    <update id="updateState">
+        update PT_SERVICE
+        set state = #{state}
+        where SRV_ID = #{srvId}
+    </update>
 
     <!--根据主键删除数据-->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -510,7 +522,6 @@ PUBLISH_TIME
     <select id="listByUserService" resultMap="AuthVoResultMap">
         SELECT A.ID,
                A.DEADLINE,
-               A.gateway_id,
                A.USER_ID,
                P.UP_CYCL,
                P.OPEN_CNDTN,
@@ -544,7 +555,9 @@ PUBLISH_TIME
                P.DEVELOP_CONTACTER,
                P.MAINTAIN_UNIT,
                P.MAINTAIN_CONTACER,
-               P.VIEW_NUM
+               P.VIEW_NUM,
+               P.state,
+               P.gateway_id,
         FROM PT_SERVICE P
                  JOIN PT_SERVICE_AUTH A ON P.SRV_ID = A.SRV_ID
         WHERE A.USER_ID = #{userId}
@@ -632,6 +645,7 @@ PUBLISH_TIME
         <result column="PROXY_ADDRESS" jdbcType="VARCHAR" property="proxyAddress"/>
         <result column="PROXY_PATH" jdbcType="VARCHAR" property="proxyPath"/>
         <result column="gateway_id" jdbcType="VARCHAR" property="gatewayId"/>
+        <result column="state" jdbcType="VARCHAR" property="state"/>
         <result column="SERVICE_SOURCE" jdbcType="VARCHAR" property="serviceSource"/>
         <result property="serviceDept" column="SERVICE_DEPT" jdbcType="VARCHAR"/>
         <result property="manageName" column="MANAGE_NAME" jdbcType="VARCHAR"/>