Commit dcbaba3af4c5cb8b8aac495471e4cfa309fffce8
1 parent
314db5be
bf
Showing
5 changed files
with
36 additions
and
5 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
| ... | ... | @@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse; |
| 8 | 8 | import cn.hutool.http.Header; |
| 9 | 9 | import cn.hutool.http.HttpRequest; |
| 10 | 10 | import com.ruoyi.common.utils.security.ShiroUtils; |
| 11 | +import com.ruoyi.project.system.dept.domain.Dept; | |
| 12 | +import com.ruoyi.project.system.dept.service.IDeptService; | |
| 11 | 13 | import com.ruoyi.project.system.user.service.IUserService; |
| 12 | 14 | import com.ruoyi.project.system.user.service.UserServiceImpl; |
| 13 | 15 | import org.apache.http.HttpResponse; |
| ... | ... | @@ -74,6 +76,9 @@ public class LoginController extends BaseController |
| 74 | 76 | @Autowired |
| 75 | 77 | private IUserService userService; |
| 76 | 78 | |
| 79 | + @Autowired | |
| 80 | + private IDeptService deptService; | |
| 81 | + | |
| 77 | 82 | @GetMapping("/login") |
| 78 | 83 | public String login(HttpServletRequest request, HttpServletResponse response) |
| 79 | 84 | { |
| ... | ... | @@ -107,9 +112,24 @@ public class LoginController extends BaseController |
| 107 | 112 | |
| 108 | 113 | |
| 109 | 114 | JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList"); |
| 110 | - | |
| 111 | 115 | String account=dataJson.get("account").toString(); |
| 112 | - //userService.registerUser(User user); | |
| 116 | + String pwd="pdgj@123"; | |
| 117 | + //用户注册 | |
| 118 | + if("0".equals(userService.checkLoginNameUnique(account))){ | |
| 119 | + JSONObject companyInfo=dataJson.getJSONObject("companyInfo"); | |
| 120 | + String code=companyInfo.getString("number"); | |
| 121 | + Dept dept=deptService.selectDeptByCode(code); | |
| 122 | + User u=new User(); | |
| 123 | + u.setLoginName(account); | |
| 124 | + u.setUserName(account); | |
| 125 | + u.setPassword(pwd); | |
| 126 | + u.setDeptId(dept.getDeptId()); | |
| 127 | + Long[] arr={2L}; | |
| 128 | + u.setRoleIds(arr); | |
| 129 | + u.setLineinfoData("[{\"name\":\"company\",\"text\":\"公司\",\"checked\":true},{\"name\":\"fCompany\",\"text\":\"分公司\",\"checked\":true},{\"name\":\"lineName\",\"text\":\"线路名称\",\"checked\":true},{\"name\":\"lineType\",\"text\":\"线路类型\",\"checked\":true},{\"name\":\"lineLevel\",\"text\":\"线路属性\",\"checked\":true},{\"name\":\"serviceType\",\"text\":\"营运方式\",\"checked\":true},{\"name\":\"revenueType\",\"text\":\"营收类型\",\"checked\":true},{\"name\":\"district\",\"text\":\"区属\",\"checked\":true},{\"name\":\"inoutDistrict\",\"text\":\"是否区内\",\"checked\":true},{\"name\":\"roadType\",\"text\":\"道路类型\",\"checked\":true},{\"name\":\"serviceTime\",\"text\":\"运营时间\",\"checked\":true},{\"name\":\"airConditionerType\",\"text\":\"是否空调\",\"checked\":true},{\"name\":\"sellTicketType\",\"text\":\"售票类型\",\"checked\":true},{\"name\":\"ticketPrice\",\"text\":\"票价\",\"checked\":true},{\"name\":\"halfwayStation\",\"text\":\"站点名称\",\"checked\":true},{\"name\":\"directions\",\"text\":\"线路走向\",\"checked\":true},{\"name\":\"stationUp\",\"text\":\"站级数(上行)\",\"checked\":true},{\"name\":\"stationDown\",\"text\":\"站级数(下行)\",\"checked\":true},{\"name\":\"firstStation\",\"text\":\"首站\",\"checked\":true},{\"name\":\"lastStation\",\"text\":\"末站\",\"checked\":true},{\"name\":\"firstTime\",\"text\":\"起点站首末班\",\"checked\":true},{\"name\":\"lastTime\",\"text\":\"终点站首末班\",\"checked\":true},{\"name\":\"mileageUp\",\"text\":\"上行里程数\",\"checked\":true},{\"name\":\"mileageDown\",\"text\":\"下行里程数\",\"checked\":true},{\"name\":\"lineDistance\",\"text\":\"线路长度\",\"checked\":true},{\"name\":\"isWarrant\",\"text\":\"是否权证\",\"checked\":true},{\"name\":\"warrantStartTime\",\"text\":\"授权起始日期\",\"checked\":true},{\"name\":\"warrantEndTime\",\"text\":\"授权结束日期\",\"checked\":true},{\"name\":\"warrantYear\",\"text\":\"授权年限\",\"checked\":true},{\"name\":\"serviceState\",\"text\":\"营运状态\",\"checked\":true},{\"name\":\"busType\",\"text\":\"车辆类型\",\"checked\":true},{\"name\":\"planCancelTime\",\"text\":\"线路暂停日期\",\"checked\":true},{\"name\":\"cancelTime\",\"text\":\"实际撤销日期\",\"checked\":true},{\"name\":\"remark\",\"text\":\"备注\",\"checked\":true},{\"name\":\"updateBy\",\"text\":\"更新人\",\"checked\":true},{\"name\":\"updateTime\",\"text\":\"更新时间\",\"checked\":true},{\"name\":\"timeSchedule\",\"text\":\"行车作业计划报备时间\",\"checked\":true},{\"name\":\"travelTimeUp\",\"text\":\"行驶时间(上行)\",\"checked\":true},{\"name\":\"travelTimeDown\",\"text\":\"行驶时间(下行)\",\"checked\":true},{\"name\":\"travelIntervalUp\",\"text\":\"行驶间隔(高峰)\",\"checked\":true},{\"name\":\"travelIntervalDown\",\"text\":\"行驶间隔(低谷)\",\"checked\":true},{\"name\":\"warrantVehiclesLarge\",\"text\":\"经营权证(大)\",\"checked\":true},{\"name\":\"warrantVehiclesMiddle\",\"text\":\"经营权证(中)\",\"checked\":true},{\"name\":\"vehiclesNumber\",\"text\":\"实际配车数\",\"checked\":true},{\"name\":\"numberVehiclesLarge\",\"text\":\"实际车辆数(大)\",\"checked\":true},{\"name\":\"numberVehiclesMiddle\",\"text\":\"实际车辆数(中)\",\"checked\":true},{\"name\":\"carPlate\",\"text\":\"车辆自编号\",\"checked\":true},{\"name\":\"numberPerson\",\"text\":\"线路配档数\",\"checked\":true},{\"name\":\"numberPersonDriver\",\"text\":\"司机人数\",\"checked\":true},{\"name\":\"numberPersonSales\",\"text\":\"售票员数\",\"checked\":true},{\"name\":\"busEvNumber\",\"text\":\"新能源车数\",\"checked\":true},{\"name\":\"divideLevel\",\"text\":\"间隔等级\",\"checked\":true},{\"name\":\"hasTimelists\",\"text\":\"是否挂牌\",\"checked\":true},{\"name\":\"isMetro\",\"text\":\"是否轨交末班车衔接\",\"checked\":true},{\"name\":\"metroTime\",\"text\":\"轨交时间\",\"checked\":true},{\"name\":\"coldBonusType\",\"text\":\"冷僻线路补贴类型\",\"checked\":true},{\"name\":\"lineUpdateType\",\"text\":\"性质\",\"checked\":true}]"); | |
| 130 | + userService.insertUser(u); | |
| 131 | + } | |
| 132 | + | |
| 113 | 133 | |
| 114 | 134 | Map<Long,Menu> menuMap = new HashMap<Long,Menu>(); |
| 115 | 135 | |
| ... | ... | @@ -129,7 +149,7 @@ public class LoginController extends BaseController |
| 129 | 149 | |
| 130 | 150 | |
| 131 | 151 | |
| 132 | - login("admin","admin123",false); | |
| 152 | + login(account,pwd,false); | |
| 133 | 153 | user = getSysUser(); |
| 134 | 154 | user.setToken(token); |
| 135 | 155 | // user.setPermissions(permissionService.getMenuPermission()); | ... | ... |
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
| ... | ... | @@ -208,7 +208,8 @@ public class UserServiceImpl implements IUserService |
| 208 | 208 | { |
| 209 | 209 | user.randomSalt(); |
| 210 | 210 | user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); |
| 211 | - user.setCreateBy(ShiroUtils.getLoginName()); | |
| 211 | + String name=ShiroUtils.getSysUser()==null?"admin":ShiroUtils.getLoginName(); | |
| 212 | + user.setCreateBy(name); | |
| 212 | 213 | // 新增用户信息 |
| 213 | 214 | int rows = userMapper.insertUser(user); |
| 214 | 215 | // 新增用户岗位关联 |
| ... | ... | @@ -535,4 +536,10 @@ public class UserServiceImpl implements IUserService |
| 535 | 536 | { |
| 536 | 537 | return userMapper.updateUser(user); |
| 537 | 538 | } |
| 539 | + | |
| 540 | + @Override | |
| 541 | + public int updUser(User user) | |
| 542 | + { | |
| 543 | + return userMapper.updateUser(user); | |
| 544 | + } | |
| 538 | 545 | } | ... | ... |
bsthLineProfiles/src/main/resources/mybatis/system/UserMapper.xml
| ... | ... | @@ -205,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 205 | 205 | <if test="pwdUpdateDate != null">pwd_update_date,</if> |
| 206 | 206 | <if test="createBy != null and createBy != ''">create_by,</if> |
| 207 | 207 | <if test="remark != null and remark != ''">remark,</if> |
| 208 | + <if test="lineinfoData != null and lineinfoData != ''">lineinfo_data,</if> | |
| 208 | 209 | create_time |
| 209 | 210 | )values( |
| 210 | 211 | <if test="userId != null and userId != ''">#{userId},</if> |
| ... | ... | @@ -222,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 222 | 223 | <if test="pwdUpdateDate != null">#{pwdUpdateDate},</if> |
| 223 | 224 | <if test="createBy != null and createBy != ''">#{createBy},</if> |
| 224 | 225 | <if test="remark != null and remark != ''">#{remark},</if> |
| 226 | + <if test="lineinfoData != null and lineinfoData != ''">#{lineinfoData},</if> | |
| 225 | 227 | sysdate() |
| 226 | 228 | ) |
| 227 | 229 | </insert> | ... | ... |