diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 55aecae..6b6c53a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -1,7 +1,11 @@ package com.ruoyi.web.controller.system; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.service.ConfigService; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.UsernamePasswordToken; @@ -13,12 +17,9 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.ConfigService; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 登录验证 @@ -61,6 +62,7 @@ public class SysLoginController extends BaseController try { subject.login(token); + System.out.println(token.toString()); return success(); } catch (AuthenticationException e) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9858254..da00fb8 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/no_power_control?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://119.45.202.115:3306/no_power_control?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: haiwei@123 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3800344..704c54e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -114,11 +114,11 @@ shiro: cipherKey: session: # Session超时时间，-1代表永不过期（默认30分钟） - expireTime: 30 + expireTime: -1 # 同步session到数据库的周期（默认1分钟） dbSyncPeriod: 1 # 相隔多久检查一次session的有效性，默认就是10分钟 - validationInterval: 10 + validationInterval: 10000 # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制） maxSession: -1 # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户 diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/domain/BaseInfo.java b/ruoyi-device/src/main/java/com/ruoyi/device/domain/BaseInfo.java index ae0d495..1fbc893 100644 --- a/ruoyi-device/src/main/java/com/ruoyi/device/domain/BaseInfo.java +++ b/ruoyi-device/src/main/java/com/ruoyi/device/domain/BaseInfo.java @@ -1,9 +1,9 @@ package com.ruoyi.device.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 设备基础信息对象 device_base_info @@ -46,7 +46,28 @@ public class BaseInfo extends BaseEntity @Excel(name = "开锁密码") private String openPassword; private String typeName; + private Double defaultPrice; + /** 默认使用时间 */ + @Excel(name = "默认使用时间") + private Double defaultTime; + + + public Double getDefaultPrice() { + return defaultPrice; + } + + public void setDefaultPrice(Double defaultPrice) { + this.defaultPrice = defaultPrice; + } + + public Double getDefaultTime() { + return defaultTime; + } + + public void setDefaultTime(Double defaultTime) { + this.defaultTime = defaultTime; + } public String getTypeName() { return typeName; diff --git a/ruoyi-device/src/main/resources/mapper/device/BaseInfoMapper.xml b/ruoyi-device/src/main/resources/mapper/device/BaseInfoMapper.xml index 3425c0e..4cd7683 100644 --- a/ruoyi-device/src/main/resources/mapper/device/BaseInfoMapper.xml +++ b/ruoyi-device/src/main/resources/mapper/device/BaseInfoMapper.xml @@ -17,30 +17,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + select obj_id, device_code, device_name, device_type, use_state, device_state, location_name, create_by, create_time, update_by, update_time, open_password from device_base_info - - + and device_code = #{deviceCode} @@ -125,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where device_code = #{deviceCode} limit 1 \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/mapper/device/BaseTypeMapper.xml b/ruoyi-device/src/main/resources/mapper/device/BaseTypeMapper.xml index ea22e14..55d828a 100644 --- a/ruoyi-device/src/main/resources/mapper/device/BaseTypeMapper.xml +++ b/ruoyi-device/src/main/resources/mapper/device/BaseTypeMapper.xml @@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select obj_id, device_type_name, default_price, default_time, create_by, create_time, update_by, update_time from device_base_type + select obj_id, device_type_name, default_price, default_time, create_by, create_time, update_by, update_time,remark from device_base_type + + + diff --git a/ruoyi-device/src/main/resources/templates/device/base_type/base_type.html b/ruoyi-device/src/main/resources/templates/device/base_type/base_type.html index e2c2129..811447d 100644 --- a/ruoyi-device/src/main/resources/templates/device/base_type/base_type.html +++ b/ruoyi-device/src/main/resources/templates/device/base_type/base_type.html @@ -1,64 +1,68 @@ - + -
-
-
-
-
- -
-
-
+
+
+
+
+
+ +
+
+
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/base_type/edit.html b/ruoyi-device/src/main/resources/templates/device/base_type/edit.html index 0d13262..4bd247a 100644 --- a/ruoyi-device/src/main/resources/templates/device/base_type/edit.html +++ b/ruoyi-device/src/main/resources/templates/device/base_type/edit.html @@ -32,6 +32,16 @@
+
+
+ +
+ +
+
+
+ + diff --git a/ruoyi-pda/src/main/java/com/ruoyi/pda/controller/LoginController.java b/ruoyi-pda/src/main/java/com/ruoyi/pda/controller/LoginController.java index 78615e9..970e820 100644 --- a/ruoyi-pda/src/main/java/com/ruoyi/pda/controller/LoginController.java +++ b/ruoyi-pda/src/main/java/com/ruoyi/pda/controller/LoginController.java @@ -1,17 +1,14 @@ package com.ruoyi.pda.controller; - import com.alibaba.fastjson.JSONObject; - +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.pda.domain.APKVersion; import com.ruoyi.pda.service.LoginService; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Created by wangh on 2020/7/17-15:18。 @@ -25,7 +22,7 @@ public class LoginController { @GetMapping("/login/finduser") - public String finduser(String name,String pass){ + public AjaxResult finduser(String name, String pass){ System.out.println("登录名称= "+name+" pass= "+pass); return service.login(name,pass); } diff --git a/ruoyi-pda/src/main/java/com/ruoyi/pda/mapper/LoginMapper.java b/ruoyi-pda/src/main/java/com/ruoyi/pda/mapper/LoginMapper.java index 8289928..08e7111 100644 --- a/ruoyi-pda/src/main/java/com/ruoyi/pda/mapper/LoginMapper.java +++ b/ruoyi-pda/src/main/java/com/ruoyi/pda/mapper/LoginMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.pda.mapper; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.pda.domain.APKVersion; import com.ruoyi.pda.domain.ApiUser; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,7 @@ import java.util.List; public interface LoginMapper { String login_findSalt(String name); - int login_getUser(@Param("name") String name, @Param("passw") String passw); + SysUser login_getUser(@Param("name") String name, @Param("passw") String passw); List selectMenuNameByUserID(Integer userID); diff --git a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java index 00b7f53..5e038a4 100644 --- a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java +++ b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java @@ -1,7 +1,8 @@ package com.ruoyi.pda.service; -import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.pda.domain.APKVersion; import com.ruoyi.pda.domain.ApiUser; import com.ruoyi.pda.mapper.LoginMapper; @@ -11,7 +12,6 @@ import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.List; /** * Created by wangh on 2021/4/26-9:27。 @@ -22,10 +22,10 @@ public class LoginService { @Autowired LoginMapper mapper; - public String login(String name, String pass) { + public AjaxResult login(String name, String pass) { try { String salt = mapper.login_findSalt(name); - Integer userID = mapper.login_getUser(name, getMD5Str(name + pass + salt)); + SysUser userID = mapper.login_getUser(name, getMD5Str(name + pass + salt)); if (userID != null) { // List menuNameList=name.equals("admin")? // mapper.selectMenuName(): @@ -34,12 +34,12 @@ public class LoginService { // return "isEmpty"; // } // return JSONObject.toJSONString(menuNameList); - return "ok"; + return AjaxResult.success(userID); } else { - return "Error"; + return AjaxResult.error(); } }catch (Exception e){ - return "Error"; + return AjaxResult.error(); } } diff --git a/ruoyi-pda/src/main/resources/mapper/LoginMapper.xml b/ruoyi-pda/src/main/resources/mapper/LoginMapper.xml index 6bc4daf..e976977 100644 --- a/ruoyi-pda/src/main/resources/mapper/LoginMapper.xml +++ b/ruoyi-pda/src/main/resources/mapper/LoginMapper.xml @@ -3,8 +3,8 @@ - + SELECT user_id,dept_id FROM sys_user where login_name=#{name} and `password`=#{passw} limit 1;