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

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ExceptionUtil;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.interfaces.core.page.Page;
 import com.ruoyi.interfaces.core.page.PageParam;
@@ -196,27 +197,34 @@ public class PtServiceController extends BaseController {
 
             s = ptServiceService.testRun(ptService);
         } catch (Exception e) {
+            ptServiceLog.setSenState("0");
+            String errorMessage = ExceptionUtil.getRootErrorMessage(e);
+            errorMessage = errorMessage.length() > 490 ? errorMessage.substring(0, 490) : errorMessage;
+            ptServiceLog.setErrorMessage(errorMessage);
             return new AjaxResult(HttpStatus.HTTP_ERROR, s);
-        }
 
+        }
+        ptServiceLog.setSenState("1");
         ptServiceLog.setExecTm(
                 DateUtils.getNowDate().getTime() - nowDate.getTime());
         ptServiceLog.setReturnData(s);
         serviceRunLogService.insertPtServiceRunLog(ptServiceLog);
         return success(s);
     }
+
     @Autowired
     private IMdAuditService mdAuditService;
 
     /**
      * 服务审核接口
+     *
      * @param service
      * @return
      */
     @GetMapping("/audit")
     public AjaxResult audit(PtService service) {
         Date nowDate = DateUtils.getNowDate();
-        if (StringUtils.isEmpty(service.getSrvId())){
+        if (StringUtils.isEmpty(service.getSrvId())) {
             return error("服务id不可为空");
         }
         MdAudit srv = new MdAudit(null, service.getSrvId(), "AUDIT", service.getAudit(), getUsername(), nowDate, service.getAuditRemark());
@@ -228,6 +236,7 @@ public class PtServiceController extends BaseController {
 
     /**
      * 服务发布接口
+     *
      * @param service
      * @return
      */

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

@@ -47,12 +47,38 @@ public class PtServiceRunLog extends BaseEntity
     @Excel(name = "请求耗时", readConverterExp = "毫=秒")
     private Long execTm;
 
+    /**
+     * 请求状态
+     */
+    private String senState;
+
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+
     public PtServiceRunLog(PtService ptService) {
         this.serId=ptService.getSrvId();
         this.mdId=ptService.getMdid();
         this.senParam= JsonUtils.objectToJson(ptService.getParams());
     }
 
+    public String getSenState() {
+        return senState;
+    }
+
+    public void setSenState(String senState) {
+        this.senState = senState;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
     public PtServiceRunLog() {
     }
 

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

@@ -20,6 +20,8 @@ public class PtServiceRunLogVo extends PtServiceRunLog {
         setExecTm(serviceRunLog.getExecTm());
         setReturnData(serviceRunLog.getReturnData());
         setCreateBy(serviceRunLog.getCreateBy());
+        setSenState(serviceRunLog.getSenState());
+        setErrorMessage(serviceRunLog.getErrorMessage());
         this.paramList = JsonUtils.jsonToPojo(serviceRunLog.getSenParam(), Object.class);
     }
 

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

@@ -5,30 +5,45 @@
 <mapper namespace="com.ruoyi.interfaces.mapper.PtServiceRunLogMapper">
 
     <resultMap type="com.ruoyi.interfaces.domain.PtServiceRunLog" id="PtServiceRunLogResult">
-        <result property="logId"    column="log_id"    />
-        <result property="serId"    column="ser_id"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="runTm"    column="run_tm"    />
-        <result property="senParam"    column="sen_param"    />
-        <result property="returnData"    column="return_data"    />
-        <result property="execTm"    column="exec_tm"    />
-        <result property="createBy"    column="create_by"    />
+        <result property="logId" column="log_id"/>
+        <result property="serId" column="ser_id"/>
+        <result property="mdId" column="md_id"/>
+        <result property="runTm" column="run_tm"/>
+        <result property="senParam" column="sen_param"/>
+        <result property="returnData" column="return_data"/>
+        <result property="execTm" column="exec_tm"/>
+        <result property="createBy" column="create_by"/>
+        <result property="senState" column="sen_state"/>
+        <result property="errorMessage" column="error_message"/>
     </resultMap>
 
     <sql id="selectPtServiceRunLogVo">
-        select log_id, ser_id, md_id, run_tm, sen_param, return_data, exec_tm,create_by from pt_service_run_log
+        select log_id,
+               ser_id,
+               md_id,
+               run_tm,
+               sen_param,
+               return_data,
+               exec_tm,
+               create_by,
+               sen_state,
+               error_message
+        from pt_service_run_log
     </sql>
 
-    <select id="selectPtServiceRunLogList" parameterType="com.ruoyi.interfaces.domain.PtServiceRunLog" resultMap="PtServiceRunLogResult">
+    <select id="selectPtServiceRunLogList" parameterType="com.ruoyi.interfaces.domain.PtServiceRunLog"
+            resultMap="PtServiceRunLogResult">
         <include refid="selectPtServiceRunLogVo"/>
         <where>
-            <if test="logId != null "> and log_id = #{logId}</if>
-            <if test="serId != null  and serId != ''"> and ser_id = #{serId}</if>
-            <if test="mdId != null  and mdId != ''"> and md_id = #{mdId}</if>
-            <if test="runTm != null "> and run_tm = #{runTm}</if>
-            <if test="senParam != null  and senParam != ''"> and sen_param = #{senParam}</if>
-            <if test="returnData != null  and returnData != ''"> and return_data = #{returnData}</if>
-            <if test="execTm != null "> and exec_tm = #{execTm}</if>
+            <if test="logId != null ">and log_id = #{logId}</if>
+            <if test="serId != null  and serId != ''">and ser_id = #{serId}</if>
+            <if test="mdId != null  and mdId != ''">and md_id = #{mdId}</if>
+            <if test="runTm != null ">and run_tm = #{runTm}</if>
+            <if test="senParam != null  and senParam != ''">and sen_param = #{senParam}</if>
+            <if test="returnData != null  and returnData != ''">and return_data = #{returnData}</if>
+            <if test="execTm != null ">and exec_tm = #{execTm}</if>
+            <if test="senState != null ">and sen_state = #{senState}</if>
+            <if test="errorMessage != null ">and error_message = #{errorMessage}</if>
         </where>
         order by run_tm desc
     </select>
@@ -38,7 +53,8 @@
         where log_id = #{logId}
     </select>
 
-    <insert id="insertPtServiceRunLog" parameterType="com.ruoyi.interfaces.domain.PtServiceRunLog" useGeneratedKeys="true" keyProperty="logId">
+    <insert id="insertPtServiceRunLog" parameterType="com.ruoyi.interfaces.domain.PtServiceRunLog"
+            useGeneratedKeys="true" keyProperty="logId">
         insert into pt_service_run_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="serId != null and serId != ''">ser_id,</if>
@@ -48,6 +64,8 @@
             <if test="returnData != null">return_data,</if>
             <if test="execTm != null">exec_tm,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="senState != null">sen_state,</if>
+            <if test="errorMessage != null">error_message,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serId != null and serId != ''">#{serId},</if>
@@ -57,6 +75,8 @@
             <if test="returnData != null">#{returnData},</if>
             <if test="execTm != null">#{execTm},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="senState != null">#{senState},</if>
+            <if test="errorMessage != null">#{errorMessage},</if>
         </trim>
     </insert>
 
@@ -75,7 +95,9 @@
     </update>
 
     <delete id="deletePtServiceRunLogByLogId" parameterType="Long">
-        delete from pt_service_run_log where log_id = #{logId}
+        delete
+        from pt_service_run_log
+        where log_id = #{logId}
     </delete>
 
     <delete id="deletePtServiceRunLogByLogIds" parameterType="String">