用户表绑定工位id功能

周峰
1 parent 783c743a
Showing 3 changed files with 34 additions and 2 deletions
src/main/java/com/huaheng/pc/agv/controller/WorkStationController.java
src/main/java/com/huaheng/pc/system/user/domain/User.java
src/main/resources/mybatis/system/UserMapper.xml
@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.common.utils.StringUtils;
+import com.huaheng.pc.system.user.domain.User;
+import com.huaheng.pc.system.user.service.IUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -44,6 +47,9 @@ public class WorkStationController extends BaseController {
     @Resource
     private IWorkStationService workStationService;
+    @Resource
+    private IUserService iUserService;
+
     @RequiresPermissions("agv:workStation:view")
     @GetMapping()
     public String workStation() {
@@ -136,4 +142,24 @@ public class WorkStationController extends BaseController {
         return toAjax(workStationService.removeByIds(Arrays.asList(Convert.toIntArray(ids))));
     }
+
+    @RequiresPermissions("agv:workStation:view")
+    @Log(title = "绑定工位", action = BusinessType.GRANT)
+    @PostMapping("/bind")
+    @ResponseBody
+    @ApiLogger(apiName = "绑定工位", from = "PDA")
+    public AjaxResult bind(String loginName, String workStationId){
+        User user = iUserService.selectUserByLoginName(loginName);
+        if(user == null){
+            return AjaxResult.error("用户" + loginName + "不存在");
+        }
+
+        WorkStation workStation = workStationService.getById(workStationId);
+        if(workStation == null){
+            return AjaxResult.error("工位ID" + workStationId + "不存在");
+        }
+        user.setWorkStationId(workStationId);
+        iUserService.updateUserInfo(user);
+        return AjaxResult.success(loginName + "成功绑定到" + workStation.getName() + "工位");
+    }
 }
@@ -143,6 +143,10 @@ public class User implements Serializable
     @TableField(value = "remark")
     private String remark;
+    /**工位id**/
+    @TableField(value = "workStationId")
+    private String workStationId;
+
     @TableField(exist = false)
     private Boolean admin;
@@ -22,6 +22,7 @@
 		<result property="updateBy"     column="updateBy"    />
 		<result property="updateTime"   column="updateTime"  />
 		<result property="remark"       column="remark"       />
+		<result property="workStationId"       column="workStationId"       />
 		<association property="dept"    column="deptId"   resultMap="deptResult" javaType="com.huaheng.pc.system.dept.domain.Dept"/>
 	</resultMap>
@@ -34,7 +35,7 @@
 	</resultMap>
 	<sql id="selectUserVo">
-        select  u.id, u.deptId, u.loginName, u.userName, u.email, u.phoneNumber, u.sex, u.avatar, u.password, u.salt, u.enable, u.deleted, u.loginIp, u.loginDate, u.createTime, u.remark,
+        select  u.id, u.deptId, u.loginName, u.userName, u.email, u.phoneNumber, u.sex, u.avatar, u.password, u.salt, u.enable, u.deleted, u.loginIp, u.loginDate, u.createTime, u.remark, u.workStationId,
        		    d.id AS deptId, d.parentId, d.deptName, d.orderNum, d.enable as dept_enable
 		from sys_user u
 			 left join sys_dept d on u.deptId = d.id
@@ -43,7 +44,7 @@
 	<select id="selectUserList"  resultMap="UserResult">
         select u.id, u.deptId, u.loginName, u.userName, u.email, u.phoneNumber, u.password, u.sex, u.avatar, u.salt, u.enable, u.deleted,
-        u.loginIp, u.loginDate, u.createBy, u.createTime, u.updateTime, u.updateBy, u.remark, d.deptName
+        u.loginIp, u.loginDate, u.createBy, u.createTime, u.updateTime, u.updateBy, u.remark, u.workStationId, d.deptName
         from sys_user u
         left join sys_dept d on u.deptId = d.id
         WHERE u.deleted = false
@@ -136,6 +137,7 @@
  			<if test="loginDate != null">loginDate = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">updateBy = #{updateBy},</if>
  			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="workStationId != null and workStationId != ''">workStationId = #{workStationId},</if>
  			updateTime = sysdate()
  		</set>
 		<where>