bf

yiming
1 parent 314db5be
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
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/system/UserMapper.xml
@@ -228,7 +228,7 @@ public class BsthTLineController extends BaseController
         loginUser.setLineinfoData(lineInfo);
-        return toAjax(userService.updateUser(loginUser));
+        return toAjax(userService.updUser(loginUser));
     }
     /**
@@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.project.system.dept.domain.Dept;
+import com.ruoyi.project.system.dept.service.IDeptService;
 import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.project.system.user.service.UserServiceImpl;
 import org.apache.http.HttpResponse;
@@ -74,6 +76,9 @@ public class LoginController extends BaseController
     @Autowired
     private IUserService userService;
+    @Autowired
+    private IDeptService deptService;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
     {
@@ -107,9 +112,24 @@ public class LoginController extends BaseController
                 JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
-
                 String account=dataJson.get("account").toString();
-                //userService.registerUser(User user);
+                String pwd="pdgj@123";
+                //用户注册
+                if("0".equals(userService.checkLoginNameUnique(account))){
+                    JSONObject companyInfo=dataJson.getJSONObject("companyInfo");
+                    String code=companyInfo.getString("number");
+                    Dept dept=deptService.selectDeptByCode(code);
+                    User u=new User();
+                    u.setLoginName(account);
+                    u.setUserName(account);
+                    u.setPassword(pwd);
+                    u.setDeptId(dept.getDeptId());
+                    Long[] arr={2L};
+                    u.setRoleIds(arr);
+                    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}]");
+                    userService.insertUser(u);
+                }
+
                 Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
@@ -129,7 +149,7 @@ public class LoginController extends BaseController
-                login("admin","admin123",false);
+                login(account,pwd,false);
                 user = getSysUser();
                 user.setToken(token);
 //    	        user.setPermissions(permissionService.getMenuPermission());
@@ -203,4 +203,6 @@ public interface IUserService
      * @return 结果
      */
     public int changeStatus(User user);
+
+    public int updUser(User user);
 }
@@ -208,7 +208,8 @@ public class UserServiceImpl implements IUserService
     {
         user.randomSalt();
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        user.setCreateBy(ShiroUtils.getLoginName());
+        String name=ShiroUtils.getSysUser()==null?"admin":ShiroUtils.getLoginName();
+        user.setCreateBy(name);
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
@@ -535,4 +536,10 @@ public class UserServiceImpl implements IUserService
     {
         return userMapper.updateUser(user);
     }
+
+    @Override
+    public int updUser(User user)
+    {
+        return userMapper.updateUser(user);
+    }
 }
@@ -205,6 +205,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+			<if test="lineinfoData != null and lineinfoData != ''">lineinfo_data,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -222,6 +223,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+			<if test="lineinfoData != null and lineinfoData != ''">#{lineinfoData},</if>
  			sysdate()
  		)
 	</insert>