修改工作人员用户名登录

base-manager/doc/api.md

@@ -6542,6 +6542,36 @@ data|object|数据对象|-
 ```
 
 
+### 工作人员密码修改
+
+**请求URL:** workman/change/password
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+loginName|String|用户名|是|-
+oldPwd|String|旧密码|是|-
+newPwd|String|新密码|是|-
+
+
+**请求样例:**
+```
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
 ### 删除工作人员
 
 **请求URL:** workman/delete

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java

 package com.mortals.xhx.module.workman.model;
 
-import java.util.List;
-import java.util.ArrayList;
-
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
 /**
  * 工作人员实体对象

base-manager/src/main/java/com/mortals/xhx/module/workman/model/vo/WorkmanVo.java

 package com.mortals.xhx.module.workman.model.vo;
 
 import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
 /**
-* 工作人员视图对象
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * 工作人员视图对象
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+@Data
 public class WorkmanVo extends BaseEntityLong {
-
+    private String oldPwd;
+    private String newPwd;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java

@@ -26,4 +26,17 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> {
     WorkmanEntity doLogin(String loginName, String password) throws AppException;
 
 
+
+    /**
+     * 用户修改密码
+     *
+     * @param loginName
+     * @param oldPwd
+     * @param newPwd
+     * @return
+     * @throws AppException
+     */
+    boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -103,4 +103,27 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
 
         return workmanEntity;
     }
+
+    @Override
+    public boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException {
+        WorkmanEntity sysUser = this.selectOne(new WorkmanQuery().loginName(loginName));
+        if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
+            throw new AppException("帐号错误！");
+        }
+        try {
+            if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
+                throw new AppException("原始密码错误！");
+            }
+        } catch (Exception e) {
+            throw new AppException("密码验认出错！", e);
+        }
+        try {
+            sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
+
+        } catch (Exception e) {
+            throw new AppException("密码转换异常！", e);
+        }
+        dao.update(sysUser);
+        return true;
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.framework.annotation.Operlog;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.role.model.RoleQuery;
 import com.mortals.xhx.base.system.role.model.RoleUserEntity;
@@ -22,10 +23,7 @@ import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -44,7 +42,6 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     private ParamService paramService;
 
     public WorkmanController() {
-        super.setFormClass(WorkmanForm.class);
         super.setModuleDesc("工作人员");
     }
 
@@ -69,7 +66,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
             WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd());
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
-            ret.put(KEY_RESULT_DATA,workmanEntity);
+            ret.put(KEY_RESULT_DATA, workmanEntity);
             recordSysLog(request, getCurUser(), "工作人员登录成功!");
             return ret.toJSONString();
         } catch (Exception e) {
@@ -79,4 +76,22 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
             return ret.toJSONString();
         }
     }
+
+    @RequestMapping(value = "change/password", method = RequestMethod.POST)
+    public String changePassword(@RequestBody WorkmanEntity query) {
+        JSONObject ret = new JSONObject();
+        try {
+            boolean bool = service.updateUserPwd(query.getLoginName(), query.getOldPwd(), query.getNewPwd());
+            if (bool) {
+                ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+                ret.put(KEY_RESULT_MSG, "密码修改成功！");
+            } else {
+                throw new AppException("账户密码修改失败！");
+            }
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file