服务审核

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

@@ -7,17 +7,21 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.interfaces.domain.MdAudit;
 import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.service.IMdAuditService;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -80,8 +84,8 @@ public class MdModelInfoController extends BaseController {
     @Log(title = "模型信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MdModelInfo mdModelInfo) {
-        if (StringUtils.isNull(mdModelInfo.getName()))return error("【模型名称】不可为空");
-        if (StringUtils.isNull(mdModelInfo.getEnname()))return error("【模型英文名称】不可为空");
+        if (StringUtils.isNull(mdModelInfo.getName())) return error("【模型名称】不可为空");
+        if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
         mdModelInfo.setRegUser(getUsername());
         mdModelInfo.setAudit("0");
         return AjaxResult.success(mdModelInfoService.insertMdModelInfo(mdModelInfo));
@@ -94,8 +98,8 @@ public class MdModelInfoController extends BaseController {
     @Log(title = "模型信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MdModelInfo mdModelInfo) {
-        if (StringUtils.isNull(mdModelInfo.getName()))return error("【模型名称】不可为空");
-        if (StringUtils.isNull(mdModelInfo.getEnname()))return error("【模型英文名称】不可为空");
+        if (StringUtils.isNull(mdModelInfo.getName())) return error("【模型名称】不可为空");
+        if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
         return toAjax(mdModelInfoService.updateMdModelInfo(mdModelInfo));
     }
 
@@ -109,9 +113,18 @@ public class MdModelInfoController extends BaseController {
         return toAjax(mdModelInfoService.deleteMdModelInfoByMdids(mdids));
     }
 
+
+    @Autowired
+    private IMdAuditService mdAuditService;
+
     @GetMapping("/audit")
-    public AjaxResult audit(String[] mdids,String audit){
-        return success(mdModelInfoService.audit(mdids,audit));
+    public AjaxResult audit(MdModelInfo mdModelInfo) {
+        Date nowDate = DateUtils.getNowDate();
+        MdAudit srv = new MdAudit(null, mdModelInfo.getMdid(), "SRV", mdModelInfo.getAudit(), getUsername(), nowDate, mdModelInfo.getAuditRemark());
+        int i = mdAuditService.insertMdAudit(srv);
+        mdModelInfo.setAuditBy(getUsername());
+        mdModelInfo.setAuditTime(nowDate);
+        return success(mdModelInfoService.audit(mdModelInfo));
     }
 
 }

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

@@ -184,7 +184,6 @@ public class PtServiceController extends BaseController {
     }
 
 
-
     @PostMapping("/testRun")
     public AjaxResult testRun(@RequestBody PtService ptService) throws IOException {
 
@@ -195,9 +194,9 @@ public class PtServiceController extends BaseController {
         String s = "";
         try {
 
-         s = ptServiceService.testRun(ptService);
-        } catch (Exception e){
-            return new  AjaxResult(HttpStatus.HTTP_ERROR,s);
+            s = ptServiceService.testRun(ptService);
+        } catch (Exception e) {
+            return new AjaxResult(HttpStatus.HTTP_ERROR, s);
         }
 
         ptServiceLog.setExecTm(
@@ -206,10 +205,17 @@ public class PtServiceController extends BaseController {
         serviceRunLogService.insertPtServiceRunLog(ptServiceLog);
         return success(s);
     }
+    @Autowired
+    private IMdAuditService mdAuditService;
 
     @GetMapping("/audit")
-    public AjaxResult audit(String[] srvIds,String audit){
-        return success(ptServiceService.audit(srvIds,audit));
+    public AjaxResult audit(PtService service) {
+        Date nowDate = DateUtils.getNowDate();
+        MdAudit srv = new MdAudit(null, service.getSrvId(), "SRV", service.getAudit(), getUsername(), nowDate, service.getAuditRemark());
+        int i = mdAuditService.insertMdAudit(srv);
+        service.setAuditBy(getUsername());
+        service.setAuditTime(nowDate);
+        return success(ptServiceService.audit(service));
     }
 
 }

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

@@ -5,78 +5,94 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 审核记录对象 md_audit
- * 
+ *
  * @author 朱得糠
  * @date 2025-09-23
  */
-public class MdAudit extends BaseEntity
-{
+public class MdAudit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private Long auditId;
 
-    /** 项目id */
+    /**
+     * 项目id
+     */
     @Excel(name = "项目id")
     private String proId;
 
-    /** 所属项目（md=模型；srv=服务） */
+    /**
+     * 所属项目（md=模型；srv=服务）
+     */
     @Excel(name = "所属项目", readConverterExp = "m=d=模型；srv=服务")
     private String proType;
 
-    /** 审核状态 1=未发起 ；2=允许发起 ； 3=已测试； 4=审核通过； 0=驳回 */
+    /**
+     * 审核状态 1=未发起 ；2=允许发起 ； 3=已测试； 4=审核通过； 0=驳回
+     */
     @Excel(name = "审核状态 1=未发起 ；2=允许发起 ； 3=已测试； 4=审核通过； 0=驳回")
     private String state;
 
-    public void setAuditId(Long auditId) 
-    {
+    public void setAuditId(Long auditId) {
         this.auditId = auditId;
     }
 
-    public Long getAuditId() 
-    {
+    public Long getAuditId() {
         return auditId;
     }
-    public void setProId(String proId) 
-    {
+
+    public void setProId(String proId) {
         this.proId = proId;
     }
 
-    public String getProId() 
-    {
+    public String getProId() {
         return proId;
     }
-    public void setProType(String proType) 
-    {
+
+    public void setProType(String proType) {
         this.proType = proType;
     }
 
-    public String getProType() 
-    {
+    public String getProType() {
         return proType;
     }
-    public void setState(String state) 
-    {
+
+    public void setState(String state) {
         this.state = state;
     }
 
-    public String getState() 
-    {
+    public String getState() {
         return state;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("auditId", getAuditId())
-            .append("proId", getProId())
-            .append("proType", getProType())
-            .append("state", getState())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("auditId", getAuditId())
+                .append("proId", getProId())
+                .append("proType", getProType())
+                .append("state", getState())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+    public MdAudit(Long auditId, String proId, String proType, String state, String createBy, Date createTime, String remark) {
+        this.auditId = auditId;
+        this.proId = proId;
+        this.proType = proType;
+        this.state = state;
+        setCreateBy(createBy);
+        setCreateTime(createTime);
+        setRemark(remark);
+    }
+
+    public MdAudit() {
     }
 }

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

@@ -372,6 +372,33 @@ public class MdModelInfo extends BaseEntity {
      * 审核状态 0=待审核；1=已审核；2 = 驳回
      */
     private String audit;
+    private String auditBy;
+    private Date auditTime;
+    private String auditRemark;
+
+    public String getAuditBy() {
+        return auditBy;
+    }
+
+    public void setAuditBy(String auditBy) {
+        this.auditBy = auditBy;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getAuditRemark() {
+        return auditRemark;
+    }
+
+    public void setAuditRemark(String auditRemark) {
+        this.auditRemark = auditRemark;
+    }
 
     public String getAudit() {
         return audit;

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -125,5 +126,9 @@ public class PtService implements Serializable {
      * 审核状态 0=待审核；1=已审核；2 = 驳回
      */
     private String audit;
+    private String auditBy;
+    private String auditRemark;
+    private Date auditTime;
+
 
 }

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

@@ -64,5 +64,5 @@ public interface MdModelInfoMapper
      */
     public int deleteMdModelInfoByMdids(String[] mdids);
 
-    int updateMdModelInfoAudit(@Param("mdids") String[] mdids,@Param("audit") String audit);
+    int updateMdModelInfoAudit(MdModelInfo mdModelInfo);
 }

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

@@ -68,7 +68,7 @@ public interface PtServiceMapper extends BaseMapper<PtService> {
 
     MdModelInfoVo selectModelService(MdModelInfoVo par);
 
-    int audit(@Param("srvIds") String[] srvIds, @Param("audit") String audit);
+    int audit(PtService service);
 
  /*   int insertSelective(PtServiceWithBLOBs record);
 

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

@@ -60,5 +60,5 @@ public interface IMdModelInfoService
      */
     public int deleteMdModelInfoByMdid(String mdid);
 
-    int audit(String[] mdids, String audit);
+    int audit(MdModelInfo mdModelInfo);
 }

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

@@ -43,5 +43,5 @@ public interface PtServiceService extends IService<PtService> {
 
     String testRun(PtService ptService) throws IOException;
 
-    int audit(String[] srvIds, String audit);
+    int audit(PtService service);
 }

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

@@ -106,8 +106,8 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService
     }
 
     @Override
-    public int audit(String[] mdids, String audit) {
+    public int audit(MdModelInfo mdModelInfo) {
 
-        return mdModelInfoMapper.updateMdModelInfoAudit(mdids,audit);
+        return mdModelInfoMapper.updateMdModelInfoAudit(mdModelInfo);
     }
 }

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

@@ -168,9 +168,9 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     }
 
     @Override
-    public int audit(String[] srvIds, String audit) {
+    public int audit(PtService service) {
 
-        return ptServiceMapper.audit(srvIds,audit);
+        return ptServiceMapper.audit(service);
     }
 
     public void senServiceLog(){

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

@@ -66,6 +66,9 @@
         <result property="regUser" column="REG_USER"/>
         <result property="sort" column="SORT"/>
         <result property="audit" column="AUDIT"/>
+        <result property="auditBy" column="AUDIT_BY"/>
+        <result property="auditTime" column="AUDIT_TIME"/>
+        <result property="auditRemark" column="AUDIT_REMARK"/>
     </resultMap>
 
     <sql id="selectMdModelInfoVo">
@@ -129,7 +132,10 @@
                MODIFYBY,
                REG_USER,
                SORT,
-               AUDIT
+               AUDIT,
+               AUDIT_BY,
+               AUDIT_TIME,
+               AUDIT_REMARK
         from md_model_info
     </sql>
 
@@ -407,12 +413,13 @@
         where MDID = #{mdid}
     </update>
     <update id="updateMdModelInfoAudit">
-        UPDATE md_model_info SET
-        AUDIT = #{audit}
-        where MDID in
-        <foreach item="mdid" collection="mdids" open="(" separator="," close=")">
-            #{mdid}
-        </foreach>
+        UPDATE md_model_info
+        SET AUDIT        = #{audit},
+            AUDIT_BY     = #{auditBy},
+            AUDIT_TIME   = #{auditTime},
+            AUDIT_REMARK = #{auditRemark}
+        where MDID =
+              #{mdid}
     </update>
 
     <delete id="deleteMdModelInfoByMdid" parameterType="String">

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

@@ -40,6 +40,9 @@
         <result column="DATA_NUM" property="dataNum" jdbcType="INTEGER"/>
         <result column="SORT" property="sort" jdbcType="INTEGER"/>
         <result column="AUDIT" property="audit" jdbcType="VARCHAR"/>
+        <result column="AUDIT_BY" property="auditBy" jdbcType="VARCHAR"/>
+        <result column="AUDIT_TIME" property="auditTime"/>
+        <result column="AUDIT_REMARK" property="auditRemark" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="AuthVoResultMap" type="com.ruoyi.interfaces.domain.vo.PtServiceVo">
         <result property="id" jdbcType="VARCHAR" column="ID"/>
@@ -82,6 +85,9 @@
         <result column="APPLY_NUM" property="applyNum" jdbcType="INTEGER"/>
         <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_REMARK" property="auditRemark" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -92,7 +98,9 @@
     SERVICE_SOURCE,SERVICE_DEPT, MANAGE_NAME,DATA_RANGE, OPEN_CNDTN, DATA_FIELD,
     URL, RQTYPE, RPTYPE, PROXY_ADDRESS,PROXY_PATH,
     TM, RELEASE_TIME, RLSTM, UPTM,
-    VIEW_NUM, CNT, APPLY_NUM, DATA_NUM,AUDIT
+    VIEW_NUM, CNT, APPLY_NUM, DATA_NUM,AUDIT,AUDIT_BY,
+AUDIT_TIME,
+AUDIT_REMARK
     </sql>
     <sql id="Blob_Column_List">
         RPCONTENT
@@ -101,7 +109,9 @@
     <sql id="SRV_INFO_List">
         SRV_ID
         , 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
+    SERVICE_DEPT, MANAGE_NAME,RELEASE_TIME,DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,VIEW_NUM,AUDIT,AUDIT_BY,
+AUDIT_TIME,
+AUDIT_REMARK
     </sql>
     <sql id="table_columns">
         MDID
@@ -140,7 +150,9 @@
             DEVELOP_CONTACTER,
             MAINTAIN_UNIT,
             MAINTAIN_CONTACER,
-            VIEW_NUM,SORT,AUDIT
+            VIEW_NUM,SORT,AUDIT,AUDIT_BY,
+AUDIT_TIME,
+AUDIT_REMARK
     </sql>
     <sql id="entity_properties">
         #{mdid,jdbcType=VARCHAR}
@@ -412,12 +424,12 @@ order by SORT
         where SRV_ID = #{srvId,jdbcType=VARCHAR}
     </update>
     <update id="audit">
-        update PT_SERVICE set AUDIT = #{audit}
-        where SRV_ID in
-        <foreach item="srvId" collection="srvIds" open="(" separator="," close=")">
-            #{srvId}
-        </foreach>
-
+        update PT_SERVICE
+        set AUDIT      = #{audit},
+            AUDIT_BY   = #{auditBy},
+            AUDIT_TIME = #{auditTime},
+            AUDIT_REMARK = #{auditRemark}
+        where SRV_ID = #{srvId}
     </update>
 
     <!--根据主键删除数据-->