diff --git a/ecell-internationalize/ecell-internationalize-app/pom.xml b/ecell-internationalize/ecell-internationalize-app/pom.xml index 9c6cc15..fa038dd 100644 --- a/ecell-internationalize/ecell-internationalize-app/pom.xml +++ b/ecell-internationalize/ecell-internationalize-app/pom.xml @@ -12,9 +12,214 @@ com.ecell.internationalize.app ecell-internationalize-app - - 8 - 8 - + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + mysql + mysql-connector-java + + + com.ecell.internationalize.common.redis + ecell-internationalize-redis + 1.0-SNAPSHOT + + + com.ecell.internationalize.common.core + ecell-internationalize-core + 1.0-SNAPSHOT + + + + + + + + + + + com.ecell.internationalize.common.swagger + ecell-internationalize-swagger + 1.0-SNAPSHOT + + + + + + + + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + + org.projectlombok + lombok + true + + + + com.github.jsqlparser + jsqlparser + 4.1 + + + com.baomidou + mybatis-plus-generator + 3.1.1 + + + mybatis + org.mybatis + + + + + + org.apache.velocity + velocity-engine-core + 2.1 + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + io.netty + netty-all + 4.1.39.Final + + + + org.jboss.marshalling + jboss-marshalling-serial + 2.0.0.Beta2 + + + + org.springframework.boot + spring-boot-starter-integration + + + org.springframework.integration + spring-integration-stream + + + + org.springframework.integration + spring-integration-mqtt + + + + org.springframework.kafka + spring-kafka + 2.8.6 + + + + + cz.mallat.uasparser + uasparser + 0.6.0 + + + + commons-httpclient + commons-httpclient + 3.1 + + + + com.xiaomi + json-simple + 1.1 + + + com.xiaomi + MiPush_SDK_Server + 2.1.0.14 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + 2.6.8 + + + true + + + + + repackage + + + + + + + + src/main/java + + **/*.xml + + true + + + src/main/resources + + **/*.xml + **/*.yml + **/*.vm + **/*.properties + + false + + + \ No newline at end of file diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/EcellInternationalizeApp.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/EcellInternationalizeApp.java new file mode 100644 index 0000000..20c2ccd --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/EcellInternationalizeApp.java @@ -0,0 +1,27 @@ +package com.ecell.internationalize.app; + +import com.ecell.internationalize.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + * @author borui + */ +@EnableAspectJAutoProxy(exposeProxy = true) +@MapperScan(basePackages={"com.ecell.internationalize.app.**.mapper"}) +@EnableAsync +@EnableCustomSwagger2 +@EnableFeignClients +@EnableScheduling +@SpringBootApplication(scanBasePackages = "com.ecell.internationalize") +public class EcellInternationalizeApp { + public static void main(String[] args) { + SpringApplication.run(EcellInternationalizeApp.class, args); + System.out.println("易赛国际化app服务系统启动成功"); + } +} diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/AddressBookApp.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/AddressBookApp.java new file mode 100644 index 0000000..5c25cd8 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/AddressBookApp.java @@ -0,0 +1,7 @@ +package com.ecell.internationalize.app.entity; + +/** + * @author borui + */ +public class AddressBookApp { +} diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/AddressBookAppService.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/AddressBookAppService.java new file mode 100644 index 0000000..b1ec9fe --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/AddressBookAppService.java @@ -0,0 +1,7 @@ +package com.ecell.internationalize.app.service; + +/** + * @author borui + */ +public interface AddressBookAppService { +} diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/AddressBookAppServiceImpl.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/AddressBookAppServiceImpl.java new file mode 100644 index 0000000..4477ef0 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/AddressBookAppServiceImpl.java @@ -0,0 +1,8 @@ +package com.ecell.internationalize.app.service.impl; + +/** + * @author borui + */ +public class AddressBookAppServiceImpl { + +} diff --git a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/EcellAuthApplication.java b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/EcellAuthApplication.java index 37f3c68..88a12cf 100644 --- a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/EcellAuthApplication.java +++ b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/EcellAuthApplication.java @@ -18,6 +18,6 @@ public class EcellAuthApplication { SpringApplication.run(EcellAuthApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n"); + System.out.println("(♥◠‿◠)ﾉﾞ 易赛国际化认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java index 701ba1e..9e030f4 100644 --- a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java +++ b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/controller/AuthController.java @@ -10,7 +10,6 @@ import com.ecell.internationalize.common.core.utils.locale.LocaleUtil; import com.ecell.internationalize.common.core.web.domain.AjaxResult; import com.ecell.internationalize.common.core.web.domain.R; import com.ecell.internationalize.common.security.service.TokenService; -import com.ecell.internationalize.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java index 9e8428a..45c2351 100644 --- a/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java +++ b/ecell-internationalize/ecell-internationalize-auth/src/main/java/com/ecell/internationalize/auth/service/impl/SysUserLoginServiceImpl.java @@ -1,6 +1,5 @@ package com.ecell.internationalize.auth.service.impl; -import cn.hutool.http.HttpUtil; import com.ecell.internationalize.auth.feign.SysUserFeignClient; import com.ecell.internationalize.auth.service.SysUserLoginService; import com.ecell.internationalize.common.core.domain.UserLogin; @@ -10,8 +9,6 @@ import com.ecell.internationalize.common.core.utils.StringUtils; import com.ecell.internationalize.common.core.utils.ip.IpUtils; import com.ecell.internationalize.common.core.utils.locale.LocaleUtil; import com.ecell.internationalize.common.core.web.domain.R; -import com.ecell.internationalize.common.security.utils.SecurityUtils; -import net.bytebuddy.implementation.bytecode.constant.FieldConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-common-system/pom.xml b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-common-system/pom.xml index ef784ce..8b66c86 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-common-system/pom.xml +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-common-system/pom.xml @@ -73,6 +73,12 @@ org.springframework.boot spring-boot-starter-mail + + com.ecell.internationalize.common.security + ecell-internationalize-security + 1.0-SNAPSHOT + compile + diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthLogic.java b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthLogic.java index db54e03..ea9c5db 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthLogic.java +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthLogic.java @@ -1,7 +1,6 @@ package com.ecell.internationalize.common.security.auth; import com.ecell.internationalize.common.core.domain.LoginUser; -import com.ecell.internationalize.common.core.domain.SysUser; import com.ecell.internationalize.common.core.domain.UserLogin; import com.ecell.internationalize.common.core.exception.auth.NotLoginException; import com.ecell.internationalize.common.core.exception.auth.NotPermissionException; @@ -184,6 +183,17 @@ public class AuthLogic { tokenService.verifyToken(loginUser); } + + /** + * 验证yisai当前用户有效期, 如果相差不足120分钟，自动刷新缓存 + * + * @param loginUser 当前用户信息 + */ + public void verifyUserLoginExpire(UserLogin loginUser) + { + tokenService.verifyYiSaiToken(loginUser); + } + /** * 验证用户是否具备某权限 * diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthUtil.java b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthUtil.java index 33ea8b4..153c71e 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthUtil.java +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/auth/AuthUtil.java @@ -2,6 +2,7 @@ package com.ecell.internationalize.common.security.auth; import com.ecell.internationalize.common.core.domain.LoginUser; import com.ecell.internationalize.common.core.domain.SysUser; +import com.ecell.internationalize.common.core.domain.UserLogin; import com.ecell.internationalize.common.security.annotation.RequiresPermissions; import com.ecell.internationalize.common.security.annotation.RequiresRoles; @@ -49,6 +50,11 @@ public class AuthUtil { return authLogic.getLoginUser(token); } + public static UserLogin getUserLogin(String token) + { + return authLogic.getUserLogin(token); + } + /** * 验证当前用户有效期 */ @@ -57,6 +63,15 @@ public class AuthUtil { authLogic.verifyLoginUserExpire(loginUser); } + + /** + * 验证yisai当前用户有效期 + */ + public static void verifyUserLoginExpire(UserLogin loginUser) + { + authLogic.verifyUserLoginExpire(loginUser); + } + /** * 当前账号是否含有指定角色标识, 返回true或false * diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/interceptor/HeaderInterceptor.java b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/interceptor/HeaderInterceptor.java index 8508fff..cc03258 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/interceptor/HeaderInterceptor.java +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/interceptor/HeaderInterceptor.java @@ -2,7 +2,7 @@ package com.ecell.internationalize.common.security.interceptor; import com.ecell.internationalize.common.core.constant.SecurityConstants; import com.ecell.internationalize.common.core.context.SecurityContextHolder; -import com.ecell.internationalize.common.core.domain.LoginUser; +import com.ecell.internationalize.common.core.domain.UserLogin; import com.ecell.internationalize.common.core.utils.ServletUtils; import com.ecell.internationalize.common.core.utils.StringUtils; import com.ecell.internationalize.common.security.auth.AuthUtil; @@ -33,10 +33,11 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor { String token = SecurityUtils.getToken(); if (StringUtils.isNotEmpty(token)) { - LoginUser loginUser = AuthUtil.getLoginUser(token); + UserLogin loginUser = AuthUtil.getUserLogin(token); + if (StringUtils.isNotNull(loginUser)) { - AuthUtil.verifyLoginUserExpire(loginUser); + AuthUtil.verifyUserLoginExpire(loginUser); SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser); } } diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/service/TokenService.java b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/service/TokenService.java index ebb5260..1d24dca 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/service/TokenService.java +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/service/TokenService.java @@ -1,11 +1,9 @@ package com.ecell.internationalize.common.security.service; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.ecell.internationalize.common.core.constant.CacheConstants; import com.ecell.internationalize.common.core.constant.SecurityConstants; import com.ecell.internationalize.common.core.domain.LoginUser; -import com.ecell.internationalize.common.core.domain.SysUser; import com.ecell.internationalize.common.core.domain.UserLogin; import com.ecell.internationalize.common.core.utils.JwtUtils; import com.ecell.internationalize.common.core.utils.ServletUtils; diff --git a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/utils/SecurityUtils.java b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/utils/SecurityUtils.java index c9d594a..bc2ce7a 100644 --- a/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/utils/SecurityUtils.java +++ b/ecell-internationalize/ecell-internationalize-common/ecell-internationalize-security/src/main/java/com/ecell/internationalize/common/security/utils/SecurityUtils.java @@ -4,12 +4,15 @@ import com.ecell.internationalize.common.core.constant.SecurityConstants; import com.ecell.internationalize.common.core.constant.TokenConstants; import com.ecell.internationalize.common.core.context.SecurityContextHolder; import com.ecell.internationalize.common.core.domain.LoginUser; -import com.ecell.internationalize.common.core.domain.SysUser; +import com.ecell.internationalize.common.core.domain.UserLogin; +import com.ecell.internationalize.common.core.exception.ServiceException; import com.ecell.internationalize.common.core.utils.ServletUtils; import com.ecell.internationalize.common.core.utils.StringUtils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; /** * @author borui @@ -60,6 +63,15 @@ public class SecurityUtils { return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, LoginUser.class); } + + /** + * yisai 获取登录用户信息 + */ + public static UserLogin getUserLogin() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, UserLogin.class); + } + /** * 获取请求token */ @@ -160,4 +172,57 @@ public class SecurityUtils { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.matches(rawPassword, encodedPassword); } + + + + + /** + * 获取厂商Id + * @param userLogin + * @return + */ + public static String getFirmId(UserLogin userLogin) { + + if (StringUtils.isNull(userLogin)) { + throw new ServiceException("用户有误，请重新登录"); + } + if ("1".equals(userLogin.getFirmFlag())) { + return userLogin.getFirmId(); + } else if ("2".equals(userLogin.getFirmFlag()) && StringUtils.isNotEmpty(userLogin.getSecondFirmId())) { + return userLogin.getSecondFirmId(); + } + return null; + } + + /** + * 获取厂商Id,代理商ID + * @param userLogin + * @return + */ + public static Map getFirmIdOrSecondFirmId(UserLogin userLogin) { + Map map =new HashMap<>(2); + if (StringUtils.isNull(userLogin)) { + throw new ServiceException("用户有误，请重新登录"); + } +// //如果是管理员 +// if (SecurityUtils.isAdminString(SecurityContextHolder.getStringUserId())){ +// return map; +// } + //是厂商 + if ("1".equals(userLogin.getFirmFlag())) { + map.put("firmFlag","1"); + map.put("firmId",userLogin.getFirmId()); + return map; + //代理商 + } else if ("2".equals(userLogin.getFirmFlag()) && StringUtils.isNotEmpty(userLogin.getSecondFirmId())) { + map.put("firmFlag","2"); + map.put("firmId",userLogin.getSecondFirmId()); + return map; + //这里有可能是管理员，还有其余的角色，其余的角色不用做数据隔离，可以看全部 + }else if ("3".equals(userLogin.getFirmFlag())){ + return map; + + } + return map; + } } diff --git a/ecell-internationalize/ecell-internationalize-gateway/src/main/java/com/ecell/internationalize/gateway/EcellGatewayApplication.java b/ecell-internationalize/ecell-internationalize-gateway/src/main/java/com/ecell/internationalize/gateway/EcellGatewayApplication.java index 276fff0..2bd4f46 100644 --- a/ecell-internationalize/ecell-internationalize-gateway/src/main/java/com/ecell/internationalize/gateway/EcellGatewayApplication.java +++ b/ecell-internationalize/ecell-internationalize-gateway/src/main/java/com/ecell/internationalize/gateway/EcellGatewayApplication.java @@ -4,11 +4,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +/** + * @author borui + */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class EcellGatewayApplication { public static void main(String[] args) { SpringApplication.run(EcellGatewayApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 易赛网关启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ 易赛国际化网关启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ecell-internationalize/ecell-internationalize-system-security/pom.xml b/ecell-internationalize/ecell-internationalize-system-security/pom.xml index 74a0260..b1e81aa 100644 --- a/ecell-internationalize/ecell-internationalize-system-security/pom.xml +++ b/ecell-internationalize/ecell-internationalize-system-security/pom.xml @@ -78,7 +78,11 @@ com.ecell.internationalize.common.sysytem ecell-internationalize-common-system 1.0-SNAPSHOT - + + + com.ecell.internationalize.common.security + ecell-internationalize-security + 1.0-SNAPSHOT diff --git a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/EcellSecurityApplication.java b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/EcellSecurityApplication.java index 17ca535..2496099 100644 --- a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/EcellSecurityApplication.java +++ b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/EcellSecurityApplication.java @@ -18,6 +18,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class EcellSecurityApplication { public static void main(String[] args) { SpringApplication.run(EcellSecurityApplication.class, args); - System.out.println("系统用户服务启动成功"); + System.out.println("易赛国际化系统用户服务启动成功"); } } diff --git a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java index 371d516..d713bfe 100644 --- a/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java +++ b/ecell-internationalize/ecell-internationalize-system-security/src/main/java/com/ecell/internationalize/system/security/controller/SysUserController.java @@ -7,7 +7,6 @@ import com.ecell.internationalize.common.core.utils.ServletUtils; import com.ecell.internationalize.common.core.utils.ip.IpUtils; import com.ecell.internationalize.common.core.utils.locale.LocaleUtil; import com.ecell.internationalize.common.core.web.domain.AjaxResult; -import com.ecell.internationalize.common.security.annotation.RequiresPermissions; import com.ecell.internationalize.common.security.utils.SecurityUtils; import com.ecell.internationalize.common.system.annotation.SystemLog; import com.ecell.internationalize.common.system.constant.FieldConstant; @@ -127,7 +126,7 @@ public class SysUserController { * @Return AjaxResult */ @ApiOperation("条件分页查询用户信息") - @RequiresPermissions("system:userList:list") + // @RequiresPermissions("system:userList:list") @PostMapping("user/pageList") public AjaxResult queryAllByPage(@RequestBody Map map){ return AjaxResult.success(LocaleUtil.getMessage("messages.success"),sysUserService.findAllByPage(map)); @@ -140,7 +139,7 @@ public class SysUserController { * @Return AjaxResult */ @ApiOperation("新增用户信息") - @RequiresPermissions("system:userList:add") +// @RequiresPermissions("system:userList:add") @SystemLog(msg = FieldConstant.USER_MANAGE,operation = FieldConstant.SAVE_OPERATOR) @PostMapping("user/save") public AjaxResult save(@RequestBody @ApiParam(name="用户", value = "用户实体",required=true) SysUser sysUser) { @@ -163,7 +162,7 @@ public class SysUserController { * @Return AjaxResult */ @ApiOperation("修改用户信息") - @RequiresPermissions("system:userList:update") + //@RequiresPermissions("system:userList:update") @SystemLog(msg =FieldConstant.USER_MANAGE,operation = FieldConstant.UPDATE_OPERATOR) @PostMapping("user/update") public AjaxResult update(@RequestBody @ApiParam(name="用户", value = "用户实体",required=true) SysUser sysUser){ @@ -192,7 +191,7 @@ public class SysUserController { * @Return AjaxResult */ @ApiOperation("删除用户信息") - @RequiresPermissions("system:userList:delete") + // @RequiresPermissions("system:userList:delete") @SystemLog(msg =FieldConstant.USER_MANAGE,operation = FieldConstant.DELETE_OPERATOR) @PostMapping("user/del") public AjaxResult del(@RequestBody @ApiParam(name="用户", value = "用户实体",required=true) SysUser sysUser){ @@ -210,7 +209,7 @@ public class SysUserController { * @Return AjaxResult */ @ApiOperation("修改用户状态") - @RequiresPermissions("system:userList:status") + // @RequiresPermissions("system:userList:status") @SystemLog(msg =FieldConstant.USER_MANAGE,operation = FieldConstant.CHANGE_STATUS_OPERATOR) @PostMapping("user/updateStatus") public AjaxResult updateStatus(@RequestBody @ApiParam(name="用户", value = "用户实体",required=true) SysUser sysUser){ diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/EcellSystemApplication.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/EcellSystemApplication.java index 56ffb93..83385cf 100644 --- a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/EcellSystemApplication.java +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/EcellSystemApplication.java @@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class EcellSystemApplication { public static void main(String[] args) { SpringApplication.run(EcellSystemApplication.class, args); - System.out.println("易赛后台服务管理系统启动成功"); + System.out.println("易赛国际化后台服务管理系统启动成功"); } } diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/DeviceStepDailyController.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/DeviceStepDailyController.java new file mode 100644 index 0000000..f0f41a8 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/DeviceStepDailyController.java @@ -0,0 +1,44 @@ +package com.ecell.internationalize.system.controller; +import com.ecell.internationalize.common.core.utils.locale.LocaleUtil; +import com.ecell.internationalize.common.core.web.domain.AjaxResult; +import com.ecell.internationalize.common.system.constant.FieldConstant; +import com.ecell.internationalize.system.service.DeviceStepDailyService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +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 java.util.Map; + +/** + *

+ * 设备步数 前端控制器 + *

+ * + * @author liy + * @since 2022-07-11 + */ +@Api(value="设备步数",tags={"设备步数接口"}) +@RestController +@RequestMapping("/device_step_daily") +public class DeviceStepDailyController { + @Autowired + private DeviceStepDailyService deviceStepDailyService; + /** + * 设备步数条件分页查询 + * @Author liy + * @Date 2022/7/12 10:38 + * @param map 分页条件查询体 + * @Return AjaxResult + */ + @ApiOperation("条件分页查询设备步数信息") + @PostMapping("step/list") + public AjaxResult queryAll(@RequestBody Map map){ + return AjaxResult.success(LocaleUtil.getMessage(FieldConstant.MESSAGES_SUCCESS),deviceStepDailyService.findAllByPage(map)); + } + +} + diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/DevicePosition.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/DevicePosition.java new file mode 100644 index 0000000..b245e78 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/entity/DevicePosition.java @@ -0,0 +1,83 @@ +package com.ecell.internationalize.system.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * 设备定位（签到） + *

+ * + * @author liy + * @since 2022-07-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("device_position") +public class DevicePosition { + +private static final long serialVersionUID=1L; + + /** + * 主键Id + */ + @TableId("id") + private String id; + + /** + * 设备iMei + */ + @TableField("i_mei") + private String mei; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 定位类型（0：LBS，1：GPS） + */ + private String positionType; + + /** + * 地址 + */ + private String address; + + /** + * 创建人 + */ + private String createUser; + /** + * 创建时间 + */ + @TableField(value = "create_time",fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** + * 修改人 + */ + private String updateUser; + /** + * 修改时间 + */ + @TableField(value = "update_time",fill = FieldFill.UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + +} diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.java new file mode 100644 index 0000000..f41f08c --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.java @@ -0,0 +1,29 @@ +package com.ecell.internationalize.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ecell.internationalize.system.entity.DeviceStepDaily; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 设备步数 Mapper 接口 + *

+ * + * @author liy + * @since 2022-07-11 + */ +public interface DeviceStepDailyMapper extends BaseMapper { + /** + * 步数条件分页查询 + * @Author liy + * @Date 2022/7/12 15:42 + * @param page 分页 + * @param map 查询条件 + * @return Page + */ + Page getList(@Param("page") Page page, @Param("map") Map map,@Param("iMeiList") List iMeiList); +} diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/DeviceStepDailyService.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/DeviceStepDailyService.java new file mode 100644 index 0000000..5211821 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/DeviceStepDailyService.java @@ -0,0 +1,27 @@ +package com.ecell.internationalize.system.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ecell.internationalize.system.entity.DeviceStepDaily; + +import java.util.Map; + +/** + *

+ * 设备步数 服务类 + *

+ * + * @author liy + * @since 2022-07-11 + */ +public interface DeviceStepDailyService extends IService { + /** + * 设备步数条件分页查询 + * @Author liy + * @Date 2022/7/12 10:42 + * @param map 分页查询体 + * @return IPage + */ + IPage findAllByPage(Map map); + +} diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/impl/DeviceStepDailyServiceImpl.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/impl/DeviceStepDailyServiceImpl.java new file mode 100644 index 0000000..478ca3e --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/service/impl/DeviceStepDailyServiceImpl.java @@ -0,0 +1,73 @@ +package com.ecell.internationalize.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ecell.internationalize.common.core.context.SecurityContextHolder; +import com.ecell.internationalize.common.system.constant.FieldConstant; +import com.ecell.internationalize.common.system.entity.SysUser; +import com.ecell.internationalize.system.entity.DeviceInfo; +import com.ecell.internationalize.system.entity.DeviceStepDaily; +import com.ecell.internationalize.system.mapper.DeviceInfoMapper; +import com.ecell.internationalize.system.mapper.DeviceStepDailyMapper; +import com.ecell.internationalize.system.mapper.FirmManageMapper; +import com.ecell.internationalize.system.service.DeviceStepDailyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * 设备步数 服务实现类 + *

+ * + * @author liy + * @since 2022-07-11 + */ +@Service +public class DeviceStepDailyServiceImpl extends ServiceImpl implements DeviceStepDailyService { + @Autowired + private DeviceStepDailyMapper deviceStepDailyMapper; + @Autowired + private FirmManageMapper firmManageMapper; + @Autowired + private DeviceInfoMapper deviceInfoMapper; + /** + * 设备步数条件分页查询 + * @Author liy + * @Date 2022/7/12 10:42 + * @param map 分页查询体 + * @return IPage + */ + @Override + public IPage findAllByPage(Map map) { + Page page=new Page<>(Integer.parseInt(map.get(FieldConstant.CURRENT).toString()),Integer.parseInt(map.get(FieldConstant.SIZE).toString())); + String userId= SecurityContextHolder.getStringUserId(); + SysUser sysUser = firmManageMapper.queryFirmId(userId); + if (FieldConstant.ADMIN.equals(userId) || "3".equals(sysUser.getFirmFlag())){ + //管理员或者超级厂商显示所有数据 + return deviceStepDailyMapper.getList(page,map,null); + } + LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DeviceInfo::getDelFlag,FieldConstant.DEL_FLAG); + //厂商 + if (FieldConstant.MATH_ONE.equals(sysUser.getFirmFlag())){ + //如果该用户选择的是厂商，显示厂商以及厂商下面的所有代理商设备数据 + lambdaQueryWrapper.eq(DeviceInfo::getFirmId,sysUser.getFirmId()); + } + else { + lambdaQueryWrapper.eq(DeviceInfo::getAgentId,sysUser.getSecondFirmId()); + } + List deviceInfoList = deviceInfoMapper.selectList(lambdaQueryWrapper); + if (CollectionUtils.isEmpty(deviceInfoList)){ + return null; + } + List iMeiList= deviceInfoList.stream().map(DeviceInfo::getImei).collect(Collectors.toList()); + return deviceStepDailyMapper.getList(page,map,iMeiList); + } +} diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.xml b/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.xml new file mode 100644 index 0000000..c44a9a2 --- /dev/null +++ b/ecell-internationalize/ecell-internationalize-system/src/main/resources/com/ecell/internationalize/system/mapper/DeviceStepDailyMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + +