Sql

Former-commit-id: f7ba536077fb7a80dd45b651dd2e3d3de1a9b283

src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrUpdateRequest.java

@@ -22,26 +22,6 @@ public class LogerrUpdateRequest extends BaseUpdateRequest {
     @NotNull(message = "[id]主键不能为NULL")
     private Long id;
 
-    /**
-     * 日志类型.
-     */
-    @NotNull(message = "[logType]日志类型不能为NULL")
-    @Select({"系统错误", "任务错误", "业务错误"})
-    private String logType;
-
-    /**
-     * 任务标题.
-     */
-    @NotBlank(message = "[logTitle]任务标题不能为空")
-    @Length(min = 0, max = 50, message = "[logTitle]任务标题长度不合法(0-50)")
-    private String logTitle;
-
-    /**
-     * 日志描述.
-     */
-    @Length(min = 0, max = 500, message = "[logNote]日志描述长度不合法(0-500)")
-    private String logNote;
-
     /**
      * 日志状态.
      */
@@ -57,30 +37,6 @@ public class LogerrUpdateRequest extends BaseUpdateRequest {
         this.id = id;
     }
 
-    public String getLogType() {
-        return this.logType;
-    }
-
-    public void setLogType(String logType) {
-        this.logType = logType;
-    }
-
-    public String getLogTitle() {
-        return this.logTitle;
-    }
-
-    public void setLogTitle(String logTitle) {
-        this.logTitle = logTitle;
-    }
-
-    public String getLogNote() {
-        return this.logNote;
-    }
-
-    public void setLogNote(String logNote) {
-        this.logNote = logNote;
-    }
-
     public String getLogState() {
         return this.logState;
     }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsvr/logerr.ftl

@@ -34,19 +34,19 @@
     <el-card class="box-card">
         <el-row>
             <el-col :span="12">
-                <el-button type="success" size="mini" icon="el-icon-shopping-cart-full" @click="onBitchSolve">开始处理</el-button>
+                <el-button type="success" size="mini" icon="el-icon-shopping-cart-full" @click="onBatchStart">开始处理</el-button>
 
-                <el-button type="warning" size="mini" icon="el-icon-circle-check" @click="onBitchShelve">处理结束</el-button>
+                <el-button type="warning" size="mini" icon="el-icon-circle-check" @click="onBatchFinish">处理结束</el-button>
             </el-col>
 
             <el-col :span="12">
                 <el-button-group style="float: right;">
                     <el-tooltip effect="dark" content="解决" placement="bottom">
-                        <el-button size="mini" icon="el-icon-check" @click="onBitchSolve"></el-button>
+                        <el-button size="mini" icon="el-icon-shopping-cart-full" @click="onBatchStart"></el-button>
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="搁置" placement="bottom">
-                        <el-button size="mini" icon="el-icon-minus" @click="onBitchShelve"></el-button>
+                        <el-button size="mini" icon="el-icon-circle-check" @click="onBatchFinish"></el-button>
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="刷新" placement="bottom">
@@ -116,13 +116,13 @@
             </el-table-column>
             <el-table-column
                     align="center"
-                    width="120"
+                    width="150"
                     fixed="right"
                     label="操作">
                 <template slot-scope="scope">
                     <wb-dropdown :arg="scope.row">
-                        <wb-dropdown-item value="解决" icon="el-icon-edit" @click="onSolve"></wb-dropdown-item>
+                        <wb-dropdown-item value="开始处理" icon="el-icon-edit" @click="onStart"></wb-dropdown-item>
-                        <wb-dropdown-item value="搁置" icon="el-icon-edit" @click="onShelve"></wb-dropdown-item>
+                        <wb-dropdown-item value="处理结束" icon="el-icon-edit" @click="onFinish"></wb-dropdown-item>
                         <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
@@ -163,8 +163,8 @@
             }
         },
         methods: {
-            onSolve: function (item) {
+            onStart: function (item) {
-                new Ajax("wsys", "logerr").update({
+                new Ajax("wsvr", "logerr").update({
                     id: item.id,
                     logState: '1',
                     rowVersion: item.rowVersion
@@ -177,8 +177,8 @@
                     }
                 }.bind(this))
             },
-            onShelve: function (item) {
+            onFinish: function (item) {
-                new Ajax("system", "logerr").update({
+                new Ajax("wsvr", "logerr").update({
                     id: item.id,
                     logState: '2',
                     rowVersion: item.rowVersion
@@ -191,13 +191,13 @@
                     }
                 }.bind(this))
             },
-            onBitchSolve: function () {
+            onBatchStart: function () {
                 if (this.select.length == 0) {
                     nav.w("至少选中一项!");
                 } else {
                     nav.tipShow("批量处理中...");
                     this.select.forAsync(function (item, next) {
-                        new Ajax("system", "logerr").update({
+                        new Ajax("wsvr", "logerr").update({
                             id: item.id,
                             logState: '1',
                             rowVersion: item.rowVersion
@@ -214,13 +214,13 @@
                     }.bind(this))
                 }
             },
-            onBitchShelve: function () {
+            onBatchFinish: function () {
                 if (this.select.length == 0) {
                     nav.w("至少选中一项!");
                 } else {
                     nav.tipShow("批量处理中...");
                     this.select.forAsync(function (item, next) {
-                        new Ajax("system", "logerr").update({
+                        new Ajax("wsvr", "logerr").update({
                             id: item.id,
                             logState: '2',
                             rowVersion: item.rowVersion
@@ -244,7 +244,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(function () {
-                    new Ajax("wsys", "logerr").delete({id: item.id},function (response) {
+                    new Ajax("wsvr", "logerr").delete({id: item.id},function (response) {
                         if (response.errors.length > 0) {
                             nav.e(response.errors[0].message);
                         } else {

src/main/resources/modules/SpringBoot/test/wsvr/LogerrTest.java

@@ -88,10 +88,7 @@ public class LogerrTest {
         //更新数据
         LogerrUpdateRequest request = new LogerrUpdateRequest();
         request.setId(createResponse.getId());
-        request.setLogType("value");
+        request.setLogState("1");
-        request.setLogTitle("任务标题");
-        request.setLogNote("日志描述");
-        request.setLogState("value");
 
         LogerrUpdateResponse response = logerrManager.update(request,token);