Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_client2/src/components/HeaderPersonal/index.vue

@@ -29,22 +29,22 @@
       <div>
         <el-form ref="userPwdForm" :model='userPwdForm' :rules="userPwdRules" label-width='100px'>
           <el-form-item label='原密码' prop="password">
-            <el-input v-model='userPwdForm.password'
+            <el-input v-model.trim='userPwdForm.password'
                       type="password"
                       auto-complete="off"
                       placeholder="请输入原密码"></el-input>
           </el-form-item>
           <el-form-item label='新密码' prop="newPassword">
-            <el-input v-model='userPwdForm.newPassword'
+            <el-input v-model.trim='userPwdForm.newPassword'
                       type="password"
                       auto-complete="off"
                       placeholder="请输入新密码"></el-input>
           </el-form-item>
           <el-form-item label='确认密码' prop="confirmPassword">
-            <el-input v-model='userPwdForm.confirmPassword'
+            <el-input v-model.trim='userPwdForm.confirmPassword'
                       type="password"
                       auto-complete="off"
-                      placeholder="请再次输入密码"></el-input>
+                      placeholder="请再次输入新密码"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -117,10 +117,11 @@ export default {
         ],
         newPassword: [
           {required: true, message: '新密码不能为空', trigger: 'blur'},
-          {min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur'}
+          {min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur'},
+          {pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[A-Za-z0-9\\W]{1,}$/, message: '密码必须由数字、字母或字符任意两种组合', trigger: 'blur'}
         ],
         confirmPassword: [
-          {required: true, message: '新密码不能为空', trigger: 'blur'},
+          {required: true, message: '确认密码不能为空', trigger: 'blur'},
           {min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur'},
           {validator: checkPwd, required: true, trigger: 'blur'}
         ]
@@ -183,6 +184,11 @@ export default {
             this.dialogClose()
           }).catch((e) => {
             loading.close()
+            this.$alert(e, '操作失败！', {
+              confirmButtonText: '确定',
+              callback: action => {
+              }
+            })
           })
         }
       })

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/ReportTableController.java

@@ -179,6 +179,7 @@ public class ReportTableController {
      * @return
      */
     @PostMapping("/tableExchangeTypeById")
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.REPORTTABLE, OperationEnum = OperationEnum.UPDATE)
     public Result tableExchangeTypeById(Integer id, Integer isAutoReport, String cron) {
         if (Blank.isEmpty(id, isAutoReport)) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "id和报表类型不能为空");
@@ -212,6 +213,21 @@ public class ReportTableController {
     }
 
     /**
+     * 根据id修改报表名称
+     * @param id
+     * @param reportTableName
+     * @return
+     */
+    @PostMapping("/updateTableNameById")
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.REPORTTABLE, OperationEnum = OperationEnum.UPDATE)
+    public Result updateTableNameById(Integer id, String reportTableName) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表id不能为空");
+        }
+        return reportTableService.updateTableNameById(id, reportTableName);
+    }
+
+    /**
      * 获取当前登录人的能查看的所有报表（包括自己创建的）
      *
      * @param page

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/ReportTableDao.java

@@ -62,4 +62,6 @@ public interface ReportTableDao {
     Integer getAllOkReportTableCount2(String userId, Integer isAutoReport);
 
     List<ReportTable> getReportTableByUserGroupId(Integer userGroupId);
+
+    Integer updateTableNameById(Integer id, String reportTableName);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/ReportTableService.java

@@ -33,4 +33,6 @@ public interface ReportTableService {
     Result getAllOkReportTable(Integer page, Integer limit, Integer isAutoReport);
 
     Result tableAssignUserById(Integer id, Integer userGroupId);
+
+    Result updateTableNameById(Integer id, String reportTableName);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/ReportTableServiceImpl.java

@@ -213,6 +213,14 @@ public class ReportTableServiceImpl implements ReportTableService {
     }
 
     @Override
+    public Result updateTableNameById(Integer id, String reportTableName) {
+        if (reportTableDao.updateTableNameById(id, reportTableName) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改报表名称失败");
+        }
+        return Result.ok("修改报表名称成功");
+    }
+
+    @Override
     public Result getAllTableTemplate(Integer page, Integer limit, String userId) {
         JSONObject jsonObject = new JSONObject();
         if (Blank.isEmpty(userId)) {

chuanyi_server/src/main/resources/mapper/ReportTableDao.xml

@@ -77,6 +77,12 @@
         where id = #{id}
     </update>
 
+    <update id="updateTableNameById">
+        update t_report_table
+        set report_table_name=#{reportTableName}
+        where id = #{id}
+    </update>
+
     <delete id="delTableTemplateById">
         delete
         from t_table_template