From b41c5599f2547ce25cde20a0aed84f832b8a83eb Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 24 十二月 2024 13:32:17 +0800 Subject: [PATCH] 修改 --- applet/src/main/java/com/jilongda/applet/service/TAppUserService.java | 2 applet/src/main/java/com/jilongda/applet/security/SecurityAccessDeniedHandler.java | 32 +++ applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java | 29 +- applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java | 3 applet/src/main/java/com/jilongda/applet/controller/LoginController.java | 4 applet/src/main/java/com/jilongda/applet/mapper/TAppUserMapper.java | 2 applet/src/main/java/com/jilongda/applet/model/SecUser.java | 136 +++++++++++++++ pom.xml | 1 applet/src/main/java/com/jilongda/applet/security/SecurityUserRoleResouce.java | 17 + applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java | 8 applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java | 73 ++++++++ /dev/null | 25 -- applet/src/main/java/com/jilongda/applet/security/AuthenticationProvider.java | 88 +++++++++ applet/src/main/java/com/jilongda/applet/security/RbacAuthorityService.java | 16 + applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java | 64 +++++++ 15 files changed, 451 insertions(+), 49 deletions(-) diff --git a/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java b/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java index 0eddaed..7f7f94c 100644 --- a/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java +++ b/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java @@ -1,5 +1,7 @@ package com.jilongda.applet.config; +import com.jilongda.applet.security.AuthenticationProvider; +import com.jilongda.applet.security.SysUserDetailsService; import com.jilongda.common.basic.Constant; import com.jilongda.common.cache.CaffineCache; import com.jilongda.common.redis.RedisAutoTemplate; @@ -12,7 +14,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -34,20 +35,18 @@ @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - private final SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint; - private final RedisAutoTemplate redisAutoTemplate; - private final CaffineCache<String> accessTokenCache; - private final CaffineCache<String> refreshTokenCache; - private final PasswordEncoder passwordEncoder; - @Autowired - public WebSecurityConfig(SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint, RedisAutoTemplate redisAutoTemplate, CaffineCache<String> accessTokenCache, CaffineCache<String> refreshTokenCache, PasswordEncoder passwordEncoder) { - this.securityAuthenticationEntryPoint = securityAuthenticationEntryPoint; - this.redisAutoTemplate = redisAutoTemplate; - this.accessTokenCache = accessTokenCache; - this.refreshTokenCache = refreshTokenCache; - this.passwordEncoder = passwordEncoder; - } + private SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint; + @Autowired + private RedisAutoTemplate redisAutoTemplate; + @Autowired + private CaffineCache<String> accessTokenCache; + @Autowired + private CaffineCache<String> refreshTokenCache; + @Autowired + private PasswordEncoder passwordEncoder; + @Autowired + private SysUserDetailsService loadUserDetailsService; /** @@ -83,7 +82,7 @@ */ @Override public void configure(AuthenticationManagerBuilder auth) { -// auth.authenticationProvider(new AuthenticationProvider()); + auth.authenticationProvider(new AuthenticationProvider(loadUserDetailsService,passwordEncoder)); } diff --git a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java index a3f06ce..a47e425 100644 --- a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java +++ b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java @@ -63,8 +63,8 @@ } AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv()); appletUserDecodeData.setOpenId(openid); - appUserService.wxLogin(appletUserDecodeData); - Map<String, Object> tokenInfos = securityUtils.login(null, null, authenticationManager, TAppUser.class, 3); + TAppUser appUser = appUserService.wxLogin(appletUserDecodeData); + Map<String, Object> tokenInfos = securityUtils.login(openid, appUser, authenticationManager, TAppUser.class, 3); return ApiResult.success(tokenInfos); } diff --git a/applet/src/main/java/com/jilongda/applet/mapper/TAppUserMapper.java b/applet/src/main/java/com/jilongda/applet/mapper/TAppUserMapper.java index ed450a3..b5eb2bd 100644 --- a/applet/src/main/java/com/jilongda/applet/mapper/TAppUserMapper.java +++ b/applet/src/main/java/com/jilongda/applet/mapper/TAppUserMapper.java @@ -2,6 +2,7 @@ import com.jilongda.applet.model.TAppUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * <p> @@ -11,6 +12,7 @@ * @author 无关风月 * @since 2024-12-09 */ +@Mapper public interface TAppUserMapper extends BaseMapper<TAppUser> { } diff --git a/applet/src/main/java/com/jilongda/applet/model/SecUser.java b/applet/src/main/java/com/jilongda/applet/model/SecUser.java new file mode 100644 index 0000000..6b5b0b4 --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/model/SecUser.java @@ -0,0 +1,136 @@ +package com.jilongda.applet.model; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jilongda.common.pojo.BaseModel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.time.LocalDateTime; + +/** + * <p> + * + * </p> + * + * @author xiaochen + * @since 2022-06-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sec_user") +@ApiModel(value = "SecUser对象", description = "") +public class SecUser extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "账户") + @Length(max = 18, message = "账户最多输入18个字符") + @TableField("account") + @Excel(name = "账号_唯一:中英文1-10个字符:禁止回车、空格等特殊字符", width = 15, orderNum = "1") + private String account; + + @ApiModelProperty(value = "密码") + @TableField("password") + @Length(min = 6, max = 16, message = "密码可输入6~16个字符") + @Excel(name = "密码_中英文1-10个字符", width = 15, orderNum = "2") + private String password; + + @ApiModelProperty(value = "用户描述") + @TableField("description") + private String description; + + @ApiModelProperty(value = "手机号码") + @TableField("phone") + @Length(min = 6, max = 11, message = "手机号码可输入6~11位") + @NotNull(message = "手机号不可为空") + @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") + @Excel(name = "手机号", width = 15, orderNum = "4") + private String phone; + + @ApiModelProperty(value = "账户状态 是否禁用") + @TableField("state") + private Boolean state; + + @ApiModelProperty(value = "最近一次登陆时间") + @TableField("last_login_time") + private LocalDateTime lastLoginTime; + + @ApiModelProperty(value = "用户昵称") + @TableField("nick_name") + private String nickName; + + @ApiModelProperty(value = "微信头像地址") + @TableField("avatar_url") + private String avatarUrl; + + @ApiModelProperty(value = "省") + @TableField("province") + private String province; + + @ApiModelProperty(value = "市") + @TableField("city") + private String city; + + @ApiModelProperty(value = "区") + @TableField("area") + private String area; + + @ApiModelProperty(value = "详细地址") + @TableField("address") + private String address; + + @ApiModelProperty(value = "生日") + @TableField("birthday") + private LocalDateTime birthday; + + @ApiModelProperty(value = "1男2女0未知") + @TableField("gender") + private Integer gender; + + @ApiModelProperty(value = "部门id") + @TableField("deptId") + private Long deptId; + + @ApiModelProperty(value = "类型1平台管理员2验光师3员工") + @TableField("userType") + private Integer userType; + @ApiModelProperty(value = "门店id") + @TableField("storeId") + private Integer storeId; + @ApiModelProperty(value = "省code") + @TableField("provinceCode") + private String provinceCode; + @ApiModelProperty(value = "市code") + @TableField("cityCode") + private String cityCode; + @ApiModelProperty(value = "区code") + @TableField("areaCode") + private String areaCode; + @ApiModelProperty(value = "图片") + @TableField("pictures") + private String pictures; + + public boolean isAdmin() + { + return isAdmin(this.id); + } + + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + +} diff --git a/applet/src/main/java/com/jilongda/applet/security/AuthenticationProvider.java b/applet/src/main/java/com/jilongda/applet/security/AuthenticationProvider.java new file mode 100644 index 0000000..d44a5cf --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/AuthenticationProvider.java @@ -0,0 +1,88 @@ +package com.jilongda.applet.security; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authentication.*; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; + +import java.util.Objects; + +/** + * 身份验证提供者--->登录验证逻辑 + * <p> + * 不管是 implements AuthenticationProvider 还是 extends DaoAuthenticationProvider 区别不大 + * <p> + * DaoAuthenticationProvider 实现了 AuthenticationProvider 类 + * <p> + * 验证逻辑都是在 public Authentication authenticate(Authentication authentication) throws AuthenticationException {} 方法中 + * + * @author xiaochen + * @date 2021-01-02 20:17 + */ +@Slf4j +public class AuthenticationProvider extends DaoAuthenticationProvider { + + private SysUserDetailsService loadUserDetailsService; + private PasswordEncoder passwordEncoder; + + public AuthenticationProvider(SysUserDetailsService loadUserDetailsService, PasswordEncoder passwordEncoder) { + this.loadUserDetailsService = loadUserDetailsService; + this.passwordEncoder = passwordEncoder; + setUserDetailsService(loadUserDetailsService); + setPasswordEncoder(passwordEncoder); + } + + @Override + public Authentication authenticate(Authentication authentication) { + // 可以在此处覆写整个登录认证逻辑 + // [1] 获取 username 和 password + String userName = (String) authentication.getPrincipal(); + String password = (String) authentication.getCredentials(); + log.info("用户数据查询======================================"); + // [2] 使用用户名从数据库读取用户信息 + SecurityUserDetails userDetails = this.loadUserDetailsService.loadUserByUsername(userName); + log.info("用户数据查询======================================:{}", userDetails); + // 判断是否被封禁 +// userDetails.setEnabled(userDetails.getState()); + // [3] 检查用户信息 + if (Objects.isNull(userDetails)) { + throw new UsernameNotFoundException("用户账户不存在"); +// } else if (userDetails.isEnabled() || userDetails.getState()) { +// throw new DisabledException(userName + " 用户已被禁用或删除,请联系管理员"); + } else if (!userDetails.isAccountNonExpired()) { + throw new AccountExpiredException(userName + " 账号已过期"); + } else if (!userDetails.isAccountNonLocked()) { + throw new LockedException(userName + " 账号已被锁定"); + } else if (!userDetails.isCredentialsNonExpired()) { + throw new LockedException(userName + " 凭证已过期"); + } + // [4] 数据库用户的密码,一般都是加密过的 + String encryptedPassword = userDetails.getPassword(); + + // 根据加密算法加密用户输入的密码,然后和数据库中保存的密码进行比较 + if (!this.passwordEncoder.matches(password, encryptedPassword)) { + throw new BadCredentialsException("密码错误"); + } + // [5] 成功登陆,把用户信息提交给 Spring Security + // 把 userDetails 作为 principal 的好处是可以放自定义的 UserDetails,这样可以存储更多有用的信息,而不只是 username, + // 默认只有 username,这里的密码使用数据库中保存的密码,而不是用户输入的明文密码,否则就暴露了密码的明文 + // 不暴露密码 +// userDetails.setPassword(null); + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(userDetails.getUsername(), null, null); + // 设置详情 + //String userInfo = JsonUtils.toJsonString(userDetails); + usernamePasswordAuthenticationToken.setDetails(userDetails); + return usernamePasswordAuthenticationToken; + } + + @Override + protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) + throws AuthenticationException { + // 可以在此处覆写密码验证逻辑 + super.additionalAuthenticationChecks(userDetails, authentication); + } +} diff --git a/applet/src/main/java/com/jilongda/applet/security/RbacAuthorityService.java b/applet/src/main/java/com/jilongda/applet/security/RbacAuthorityService.java new file mode 100644 index 0000000..81069bb --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/RbacAuthorityService.java @@ -0,0 +1,16 @@ +package com.jilongda.applet.security; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @author xiaochen + * @ClassName RbacAuthorityService + * @Description + * @date 2020-09-23 11:32 + */ +@Component +@Slf4j +public class RbacAuthorityService { + +} diff --git a/applet/src/main/java/com/jilongda/applet/security/SecurityAccessDeniedHandler.java b/applet/src/main/java/com/jilongda/applet/security/SecurityAccessDeniedHandler.java new file mode 100644 index 0000000..3ac11c2 --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/SecurityAccessDeniedHandler.java @@ -0,0 +1,32 @@ +package com.jilongda.applet.security; + +import com.jilongda.common.basic.ApiResult; +import com.jilongda.common.swagger.GlobalResultEnum; +import com.jilongda.common.utils.ResponseUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * 认证过的用户访问没有权限资源的处理 + * + * @author xiaochen + * @date + */ + +@Component +@Slf4j +public class SecurityAccessDeniedHandler implements AccessDeniedHandler { + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) { + log.info(request.getRequestURL() + "没有权限"); + response.setCharacterEncoding("utf-8"); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + ResponseUtils.renderJson(response, ApiResult.status(GlobalResultEnum.FORBIDDEN)); + } +} diff --git a/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java b/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java new file mode 100644 index 0000000..4355152 --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java @@ -0,0 +1,73 @@ +package com.jilongda.applet.security; + +import com.jilongda.applet.model.TAppUser; +import lombok.Data; +import lombok.Setter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.io.Serializable; +import java.util.Collection; + +/** + * @author xiaochen + * @ClassName DinePeopleDetails + * @Description + * @date 2020-08-20 20:36 + */ +@Data +public class SecurityUserDetails extends TAppUser implements UserDetails, Serializable { + private static final long serialVersionUID = 8154896751339152731L; + @Setter + private Boolean accountNonExpired = true; + @Setter + private Boolean accountNonLocked = true; + @Setter + private Boolean credentialsNonExpired = true; + @Setter + private Boolean enabled = true; + + + /** + * 不在此处做权限校验 + * + * @return + */ + @Override + public Collection<? extends GrantedAuthority> getAuthorities() { + return null; + } + + @Override + public String getPassword() { +// return super.getPassword(); + return null; + } + + @Override + public String getUsername() { +// return super.getAccount(); + return super.getOpenId(); + } + + @Override + public boolean isAccountNonExpired() { + return this.accountNonExpired; + } + + @Override + public boolean isAccountNonLocked() { + return this.accountNonLocked; + } + + @Override + public boolean isCredentialsNonExpired() { + return this.credentialsNonExpired; + } + + @Override + public boolean isEnabled() { + return this.enabled; + } + +} diff --git a/applet/src/main/java/com/jilongda/applet/security/SecurityUserRoleResouce.java b/applet/src/main/java/com/jilongda/applet/security/SecurityUserRoleResouce.java new file mode 100644 index 0000000..21a31c7 --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/SecurityUserRoleResouce.java @@ -0,0 +1,17 @@ +package com.jilongda.applet.security; + +import com.jilongda.applet.model.SecUser; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author xiaochen + * @ClassName SysUserRoleResouce + * @Description + * @date 2021-05-20 15:10 + */ +@Data +public class SecurityUserRoleResouce extends SecUser implements Serializable { +} diff --git a/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java b/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java new file mode 100644 index 0000000..5ef5472 --- /dev/null +++ b/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java @@ -0,0 +1,64 @@ +package com.jilongda.applet.security; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jilongda.applet.mapper.TAppUserMapper; +import com.jilongda.applet.model.SecUser; +import com.jilongda.applet.model.TAppUser; +import com.jilongda.common.basic.Constant; +import com.jilongda.common.utils.SpringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + + +/** + * 用户登录认证信息查询 + * + * @author xiaochen + * @date Jun 29, 2019 + */ +@Component("loadUserDetailsService") +public class SysUserDetailsService implements UserDetailsService { + @Autowired + private TAppUserMapper appUserMapper; + + + @Override + public SecurityUserDetails loadUserByUsername(String openId) throws UsernameNotFoundException { + TAppUser user = appUserMapper.selectOne(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getOpenId, openId).last(" LIMIT 1")); + + if (Objects.isNull(user)) { + throw new UsernameNotFoundException("该用户不存在"); + } + + SecurityUserDetails vo = SpringUtils.beanCopy(user, SecurityUserDetails.class); +// if (user.getAccount().equals(Constant.ADMIN)) { +// getAdminPermission(vo); +// } else { +// List<SecRole> roles = secRoleMapper.selectRolesByUid(user.getId()); +// List<Long> roleIds = roles.stream().map(SecRole::getId).collect(Collectors.toList()); +// List<SecResourceVO> resources; +// if (CollectionUtils.isEmpty(roleIds)) { +// resources = new ArrayList<>(); +// } else { +// resources = secUserService.getResourceTag(user.getId()); +// } +// vo.setRoles(roles); +// vo.setResources(resources); +// } +// // 更新登录时间 +// SecurityUserDetails securityUserDetails = new SecurityUserDetails(); +// securityUserDetails.setId(user.getId()); +// securityUserDetails.setLastLoginTime(LocalDateTime.now()); +// secUserMapper.updateById(securityUserDetails); + return vo; + } +} diff --git a/applet/src/main/java/com/jilongda/applet/service/TAppUserService.java b/applet/src/main/java/com/jilongda/applet/service/TAppUserService.java index 8bd1467..ad67362 100644 --- a/applet/src/main/java/com/jilongda/applet/service/TAppUserService.java +++ b/applet/src/main/java/com/jilongda/applet/service/TAppUserService.java @@ -19,5 +19,5 @@ * 微信小程序登录用户封装 * @param appletUserDecodeData */ - void wxLogin(AppletUserDecodeData appletUserDecodeData); + TAppUser wxLogin(AppletUserDecodeData appletUserDecodeData); } diff --git a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java index c4d1fe7..5cd8836 100644 --- a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java +++ b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java @@ -27,7 +27,7 @@ @Service public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService { @Override - public void wxLogin(AppletUserDecodeData appletUserDecodeData) { + public TAppUser wxLogin(AppletUserDecodeData appletUserDecodeData) { // 通过手机号查询用户,是否已存在手动导入用户,包含支付宝用户 TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class) .eq(TAppUser::getOpenId, appletUserDecodeData.getOpenId()) @@ -44,5 +44,6 @@ throw new ServiceException("账号被冻结,请联系管理员"); } } + return appUser; } } diff --git a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java index 899ef21..512ec86 100644 --- a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java +++ b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java @@ -17,13 +17,13 @@ public Integer getUserId(){ String username = JwtTokenUtils.getUsername(); - TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0)); + TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0)); return appUser.getId(); } public TAppUser getLoginUser(){ String username = JwtTokenUtils.getUsername(); - TAppUser TAppUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0)); + TAppUser TAppUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0)); return TAppUser; } @@ -36,13 +36,13 @@ */ public void logoff(){ String username = JwtTokenUtils.getUsername(); - TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0)); + TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0)); userName.setIsDelete(true); appUserService.saveOrUpdate(userName); } public Boolean checkPhoneExits(String phone){ - TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", phone).eq("isDelete",0)); + TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", phone).eq("isDelete",0)); if(userName!=null){ return true; }else{ diff --git a/optometry/pom.xml b/optometry/pom.xml deleted file mode 100644 index 401cd4b..0000000 --- a/optometry/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>eyes</artifactId> - <groupId>com</groupId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>optometry</artifactId> - - <properties> - <maven.compiler.source>8</maven.compiler.source> - <maven.compiler.target>8</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.aliyun</groupId> - <artifactId>aliyun-java-sdk-core</artifactId> - <version>4.4.3</version> - </dependency> - <dependency> - <groupId>com.huaweicloud</groupId> - <artifactId>esdk-obs-java</artifactId> - <version>3.19.5</version> - </dependency> - <dependency> - <groupId>com</groupId> - <artifactId>common</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> - <version>5.5.3</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-config</artifactId> - <version>5.5.3</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-web</artifactId> - <version>5.5.3</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-crypto</artifactId> - <version>5.5.3</version> - </dependency> - <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <version>RELEASE</version> - <scope>compile</scope> - </dependency> - <!-- <dependency>--> - <!-- <groupId>com.aliyun</groupId>--> - <!-- <artifactId>dingtalk</artifactId>--> - <!-- <version>2.0.0</version>--> - <!-- </dependency>--> - <dependency> - <groupId>com.aliyun</groupId> - <artifactId>alibaba-dingtalk-service-sdk</artifactId> - <version>2.0.0</version> - </dependency> - - </dependencies> - - <build> - <finalName>optometry</finalName> - - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> - <configuration> - <excludes> - <exclude> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </exclude> - </excludes> - <mainClass>com.jilongda.optometry.AppletApplication</mainClass> - </configuration> - </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <encoding>UTF-8</encoding> - <optimize>true</optimize> - <useIncrementalCompilation>false</useIncrementalCompilation> - <!-- 去除泛型编译告警 --> - <compilerArgument>-Xlint:unchecked</compilerArgument> - </configuration> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/AppletApplication.java b/optometry/src/main/java/com/jilongda/optometry/AppletApplication.java deleted file mode 100644 index 3c80ea4..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/AppletApplication.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.jilongda.optometry; - -import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.core.env.Environment; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -import java.net.InetAddress; -import java.net.UnknownHostException; - -/** - * @Description 启动类 - * @Author xiaochen - * @Date 2022/6/8 17:33 - */ -@Slf4j -@ComponentScan(basePackages = "com.jilongda") -@MapperScan({"com.jilongda.optometry.mapper"}) -@EnableTransactionManagement -@SpringBootApplication -public class AppletApplication { - - public static void main(String[] args) throws UnknownHostException { - ConfigurableApplicationContext application = SpringApplication.run(AppletApplication.class, args); - Environment env = application.getEnvironment(); - log.info("\n----------------------------------------------------------\n\t" + - "应用 '{}' 运行成功! 访问连接:\n\t" + - "Swagger文档: \t\thttp://{}:{}/doc.html\n" + - "----------------------------------------------------------", - env.getProperty("spring.application.name", "小程序"), - InetAddress.getLocalHost().getHostAddress(), - env.getProperty("server.port", "8088")); - } - - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/aspect/StateAspect.java b/optometry/src/main/java/com/jilongda/optometry/aspect/StateAspect.java deleted file mode 100644 index abcde01..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/aspect/StateAspect.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jilongda.optometry.aspect; - - -import com.jilongda.common.exception.TokenException; -import com.jilongda.optometry.model.SecUser; -import com.jilongda.optometry.utils.LoginInfoUtil; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - - -@Aspect -@Component - -public class StateAspect { - @Autowired - private LoginInfoUtil loginInfoUtil; - @Pointcut("execution(* com.jilongda.applet.controller.*.*(..)) && !execution( * com.jilongda.applet.controller.LoginController.*(..)) && !execution(* com.jilongda.applet.controller.TGoodsController.getConfigById(..))") - public void state(){ - - } - - @Before("state()") - public void isfrozen(){ - - SecUser loginUser = loginInfoUtil.getLoginUser(); - if (loginUser==null){ - throw new TokenException("当前账号已被删除"); - } - - if (loginUser.getState()){ - throw new TokenException("账号已冻结"); - } - - System.err.println("进入切面"); - - } - - - } diff --git a/optometry/src/main/java/com/jilongda/optometry/config/AuthenticationFilter1.java b/optometry/src/main/java/com/jilongda/optometry/config/AuthenticationFilter1.java deleted file mode 100644 index 8653ccf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/config/AuthenticationFilter1.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.jilongda.optometry.config; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jilongda.common.basic.ApiResult; -import com.jilongda.common.basic.Constant; -import com.jilongda.common.cache.CaffineCache; -import com.jilongda.common.exception.ServiceException; -import com.jilongda.common.exception.TokenException; -import com.jilongda.common.security.JwtTokenUtils; -import com.jilongda.common.security.SecurityUtils; -import com.jilongda.common.utils.ResponseUtils; -import com.jilongda.optometry.model.SecUser; -import com.jilongda.optometry.service.SecUserService; -import io.jsonwebtoken.Claims; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.Base64Utils; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.annotation.Resource; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Objects; - - -/** - * 登录认证检查过滤器 - * - * @author xiaochen - * @date Jun 29, 2020 - * <p> - * OncePerRequestFilter是在一次外部请求中只过滤一次。对于服务器内部之间的forward等请求,不会再次执行过滤方法。 - * <p> - * 文档参见:https://www.jianshu.com/p/b2aa7dd346a2 - */ -@Slf4j - -public class AuthenticationFilter1 extends OncePerRequestFilter { - private final SecurityUtils securityUtils; - private CaffineCache<String> accessTokenCache; - public AuthenticationFilter1(SecurityUtils securityUtils) { - this.securityUtils = securityUtils; - } - @Resource - private SecUserService secUserService; - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { - // 全局异常无法捕捉过滤器异常,需在此处做处理 - try { - String token = JwtTokenUtils.getToken(request); - // 获取摘要信息 - Claims claims = JwtTokenUtils.getClaimsFromToken(token); - CaffineCache<String> tokenCache = null; - if (Objects.nonNull(this.accessTokenCache)) { - tokenCache = this.accessTokenCache; - } - // 如果token被托管 - if (Objects.nonNull(tokenCache)) { - String accessToken = tokenCache.getKey(Constant.JWT_TOKEN_KEY_PREFIX + claims.getSubject()); - if (Objects.isNull(accessToken)) { - throw new TokenException(com.jilongda.common.swagger.GlobalResultEnum.TOKEN_EXPIRE.getCode(), com.jilongda.common.swagger.GlobalResultEnum.TOKEN_EXPIRE.getMessage()); - } - accessToken = new String(Base64Utils.decode(accessToken.getBytes())); - if (!token.equals(accessToken)) { - throw new TokenException(com.jilongda.common.swagger.GlobalResultEnum.TOKEN_EXPIRE.getCode(), GlobalResultEnum.TOKEN_EXPIRE.getMessage()); - } - } - Authentication authentication = JwtTokenUtils.getAuthenticatione(token); - SecurityContextHolder.getContext().setAuthentication(authentication); - - Object principal = authentication.getPrincipal(); - String string = principal.toString(); - SecUser one = secUserService.getOne(Wrappers.lambdaQuery(SecUser.class).eq(SecUser::getPhone, principal.toString())); -// securityUtils.checkAuthentication(request); -// chain.doFilter(request, response); - } catch (Exception e) { - // 如果是业务异常,需返回状态码 - if (e instanceof ServiceException) { - ServiceException e1 = (ServiceException) e; - ResponseUtils.renderJson(response, ApiResult.failed(e1.getCode(), e.getMessage())); - } else if (e instanceof TokenException) { - TokenException e1 = (TokenException) e; - ResponseUtils.renderJson(response, ApiResult.failed(e1.getCode(), e.getMessage())); - } else { - ResponseUtils.renderJson(response, ApiResult.failed(e.getMessage())); - } - return; - } - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/config/GlobalResultEnum.java b/optometry/src/main/java/com/jilongda/optometry/config/GlobalResultEnum.java deleted file mode 100644 index ec4e52d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/config/GlobalResultEnum.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.jilongda.optometry.config; - - -/** - * @author xiaochen - * @ClassName: ResultCode - * @Description: 返回的状态码 - * @date 2021-12-03 9:26 - */ - -public enum GlobalResultEnum { - - /** - * HTTP接口通信相关 - */ - FAIL(500, "操作失败"), - - SUCCESS(200, "操作成功"), - - /** - * 账号相关 - */ - USER_NOT_EXIST(100, "该用户不存在"), - - PHONE_UNLIKE_BIND(101, "手机号非当前用户绑定手机"), - - TWICE_PASSWORD_DISAGREED(102, "两次输入密码不一致"), - - ACCOUNT_DISABLED(103, "账号已被禁用"), - - UPDATE_INIT_PWD(104, "请修改初始密码"), - - USER_PASS_ERRO(105, "账户或密码错误"), - - /** - * 资源相关 - */ - NOT_FOUND(404, "找不到资源"), - - FORBIDDEN(403, "没有访问权限"), - - UNAUTHORIZED(401, "未认证,请登录后操作"), - - FAIL_AUTHORIZED(405, "认证失败"), - - /** - * 应用相关 - */ - ERROR(505, "服务器内部错误"), - - APPLY_STOP(502, "应用已停止运行"), - - - /** - * 会话相关 - */ - TOKEN_EXPIRE(401, "请重新登录"), - TOKEN_PARSE_ERROR(601, "令牌解析错误,请检查令牌是否正确"), - REF_TOKEN_EXPIRE(602, "刷新令牌过期或无效,请重新登录"), - LOGIN_EXPIRE(603, "登陆过期,请重新登录"); - - - public int code; - - public String message; - - GlobalResultEnum(int code, String message) { - this.code = code; - this.message = message; - } - - public int getCode() { - return code; - } - - public String getMessage() { - return message; - } - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/config/WebSecurityConfig.java b/optometry/src/main/java/com/jilongda/optometry/config/WebSecurityConfig.java deleted file mode 100644 index b85935a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/config/WebSecurityConfig.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.jilongda.optometry.config; - -import com.jilongda.common.basic.Constant; -import com.jilongda.common.cache.CaffineCache; -import com.jilongda.common.redis.RedisAutoTemplate; -import com.jilongda.common.security.SecurityUtils; -import com.jilongda.common.security.filter.AuthenticationFilter; -import com.jilongda.common.security.hadler.SecurityAuthenticationEntryPoint; -import com.jilongda.common.swagger.SwaggerAutoConfiguration; -import com.jilongda.optometry.security.AuthenticationProvider; -import com.jilongda.optometry.security.SysUserDetailsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; - -/** - * 细粒度的访问控制 - * <p> - * 注:需要使用注解@EnableGlobalMethodSecurity(prePostEnabled=true) 开启 - * - * @author xiaochen - */ -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - private final SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint; - private final RedisAutoTemplate redisAutoTemplate; - private final CaffineCache<String> accessTokenCache; - private final CaffineCache<String> refreshTokenCache; - private final SysUserDetailsService loadUserDetailsService; - private final PasswordEncoder passwordEncoder; - - @Autowired - public WebSecurityConfig(SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint, RedisAutoTemplate redisAutoTemplate, CaffineCache<String> accessTokenCache, CaffineCache<String> refreshTokenCache, SysUserDetailsService loadUserDetailsService, PasswordEncoder passwordEncoder) { - this.securityAuthenticationEntryPoint = securityAuthenticationEntryPoint; - this.redisAutoTemplate = redisAutoTemplate; - this.accessTokenCache = accessTokenCache; - this.refreshTokenCache = refreshTokenCache; - this.loadUserDetailsService = loadUserDetailsService; - this.passwordEncoder = passwordEncoder; - } - - - /** - * 应用重启token无效,可手动使令牌无效,管理了token的生命周期 - * - * @return - */ - @Bean - public SecurityUtils securityUtils() { - return new SecurityUtils(accessTokenCache, refreshTokenCache); -// return new SecurityUtils(); - } - - - /** - * 不需要认证的在此处放行,比如系统的一些字典请求 - * 会包含Basic认证的请求。意思是如果请求在Basic中存在,在此处也存在,那么该请求的认证会被忽略 - * 这种方式的优势是不走 Spring Security 过滤器链 - * - * @param web - */ - @Override - public void configure(WebSecurity web) { - web.ignoring().antMatchers(SwaggerAutoConfiguration.DOC_LIST); - web.ignoring().antMatchers(Constant.APPLET_AUTH_WHITELIST); - } - - - /** - * 使用自定义登录身份认证组件,自实现rest登录请求,不适用于在过滤其中实现 在过滤其中无法提供接口文档,维护不方便 - * - * @param auth - */ - @Override - public void configure(AuthenticationManagerBuilder auth) { - auth.authenticationProvider(new AuthenticationProvider(loadUserDetailsService, passwordEncoder)); - } - - - - /** - * Security各项配置 - * - * @param http - * @throws Exception - */ - @Override - protected void configure(HttpSecurity http) throws Exception { - // 需要Basic认证的请求 - http - .cors().disable() - // 关闭登录,自定义接口实现 - .formLogin().disable() - // 关闭httpBasic认证 - .httpBasic().disable() - // 关闭退出,自定义接口实现 - .logout().disable() - .csrf().disable() - // 放在 Cookie 中返回前端,防止跨域伪造 - //.csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).and() - //.and() - .authorizeRequests() - // 跨域预检请求 - .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() - // 登录URL permitAll() 无需保护 ---> 此种方式配置忽略认证规则会走Spring Security 过滤器链,在过滤器链中,给请求放行 - // 不需要保护的请求,但需要经过过滤连 - //.antMatchers(HttpMethod.POST, "/login").permitAll() - // 微信登录 - .antMatchers(HttpMethod.GET, "/**/openId-by-jscode2session/**").permitAll() - .antMatchers(HttpMethod.POST, "/login").permitAll() - .antMatchers(HttpMethod.POST, "/code/login").permitAll() - .antMatchers(HttpMethod.POST, "/sendCode").permitAll() - .antMatchers(HttpMethod.POST, "/sendPassCode").permitAll() - .antMatchers(HttpMethod.POST, "/pageResetPassword").permitAll() - // 其他都需要权限认证 - .anyRequest() - .authenticated() - // 其他所有请求需要身份认证 - .and() - // 异常拦截 - .exceptionHandling() - // 未授权用户访问无权限时的处理 - .authenticationEntryPoint(securityAuthenticationEntryPoint); - // 此处存在session共享的问题,如要共享session,则需要管理 - http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); - // 访问控制时登录状态检查过滤器 - http.addFilterBefore(new AuthenticationFilter(securityUtils()), UsernamePasswordAuthenticationFilter.class); - // 异常捕捉过滤器,必须在AuthenticationFilter之前才能捕捉到异常信息 - http.addFilterBefore(new AuthenticationFilter(securityUtils()), AuthenticationFilter.class); - //禁用缓存 - http.headers().cacheControl(); - } - - - /** - * 验证管理器,在登录接口时用到 - * - * @return - * @throws Exception - */ - @Bean - @Override - public AuthenticationManager authenticationManager() throws Exception { - return super.authenticationManager(); - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/LoginController.java b/optometry/src/main/java/com/jilongda/optometry/controller/LoginController.java deleted file mode 100644 index 7a4e5e9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/LoginController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jilongda.optometry.controller; - - -import com.jilongda.common.basic.ApiResult; -import com.jilongda.common.redis.RedisAutoTemplate; -import com.jilongda.common.security.SecurityUtils; -import com.jilongda.common.utils.WebUtils; -import com.jilongda.optometry.model.TAppUser; -import com.jilongda.optometry.service.SecUserService; -import com.jilongda.optometry.service.TAppUserService; -import com.jilongda.optometry.wx.body.resp.Code2SessionRespBody; -import com.jilongda.optometry.wx.body.resq.Code2SessionResqBody; -import com.jilongda.optometry.wx.pojo.AppletUserDecodeData; -import com.jilongda.optometry.wx.pojo.AppletUserEncrypteData; -import com.jilongda.optometry.wx.utils.WeixinProperties; -import com.jilongda.optometry.wx.utils.WxAppletTools; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; - -import java.util.Map; - -/** - * <p> - * 会员表 前端控制器 - * </p> - * - * @author xiaochen - * @since 2021-07-28 - */ -@Slf4j -@Api(tags = "用户登录相关") -@RestController -@RequestMapping("/") -public class LoginController { - @Autowired - private SecurityUtils securityUtils; - @Autowired - private AuthenticationManager authenticationManager; - @Autowired - private RedisAutoTemplate redisAutoTemplate; - @Autowired - private TAppUserService appUserService; - @Autowired - private WeixinProperties wxConfig; - @Autowired - private RestTemplate wxRestTemplate; - @Autowired - private SecUserService secUserService; - - @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"}) - @PostMapping("/openIdByJsCode") - public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) { -// secUserService.lambdaQuery().eq(TAppUser::getOpenId, data.getOpenId()).one(); - Map<String, Object> tokenInfos = securityUtils.login(null, null, authenticationManager, TAppUser.class, 3); - return ApiResult.success(tokenInfos); - } - - @ApiOperation("退出登录") - @GetMapping("logout") - public ApiResult<String> logout() { - boolean flag = securityUtils.invalidateToken(WebUtils.request()); - if (flag) { - return ApiResult.success("退出成功"); - } - return ApiResult.success(); - } - - - - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecFeeItemsController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecFeeItemsController.java deleted file mode 100644 index 82a6050..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecFeeItemsController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 系统设置-收费项设置 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-fee-items") -public class SecFeeItemsController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecResourcesController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecResourcesController.java deleted file mode 100644 index 1f45d64..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecResourcesController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 资源表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-resources") -public class SecResourcesController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleController.java deleted file mode 100644 index f5fabc1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-role") -public class SecRoleController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleResourceController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleResourceController.java deleted file mode 100644 index f5a9b93..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecRoleResourceController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-role-resource") -public class SecRoleResourceController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecSettingController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecSettingController.java deleted file mode 100644 index 666f309..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecSettingController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 系统设置 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-setting") -public class SecSettingController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecUserController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecUserController.java deleted file mode 100644 index 4ebedce..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecUserController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-user") -public class SecUserController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/SecUserRoleController.java b/optometry/src/main/java/com/jilongda/optometry/controller/SecUserRoleController.java deleted file mode 100644 index 8de16da..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/SecUserRoleController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/sec-user-role") -public class SecUserRoleController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TAppUserController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TAppUserController.java deleted file mode 100644 index f5d5636..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TAppUserController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 用户表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-app-user") -public class TAppUserController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TBrandController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TBrandController.java deleted file mode 100644 index 81c4faf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TBrandController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架/镜片品牌表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-brand") -public class TBrandController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TCouponController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TCouponController.java deleted file mode 100644 index bfde8e5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TCouponController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 优惠券领取记录 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-coupon") -public class TCouponController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TCouponReceiveController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TCouponReceiveController.java deleted file mode 100644 index ce7e1f7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TCouponReceiveController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 优惠券 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-coupon-receive") -public class TCouponReceiveController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TFrameWarehousingDetailController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TFrameWarehousingDetailController.java deleted file mode 100644 index 3fd0a7a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TFrameWarehousingDetailController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架出库入库详细表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-frame-warehousing-detail") -public class TFrameWarehousingDetailController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryController.java deleted file mode 100644 index 95d68b2..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 盘点表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-inventory") -public class TInventoryController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryFrameDetailController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryFrameDetailController.java deleted file mode 100644 index 5bd8368..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryFrameDetailController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 材质表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-inventory-frame-detail") -public class TInventoryFrameDetailController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryLensDetailController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryLensDetailController.java deleted file mode 100644 index 5645744..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TInventoryLensDetailController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架盘点详细表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-inventory-lens-detail") -public class TInventoryLensDetailController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TLensSeriesController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TLensSeriesController.java deleted file mode 100644 index 838145d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TLensSeriesController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜片系列表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-lens-series") -public class TLensSeriesController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TLensWarehousingDetailController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TLensWarehousingDetailController.java deleted file mode 100644 index c2b5662..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TLensWarehousingDetailController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜片出库入库明细表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-lens-warehousing-detail") -public class TLensWarehousingDetailController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TLineUpController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TLineUpController.java deleted file mode 100644 index 8d801dd..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TLineUpController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 排号管理 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-line-up") -public class TLineUpController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TMaterialController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TMaterialController.java deleted file mode 100644 index fa32c48..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TMaterialController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架/镜片品牌表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-material") -public class TMaterialController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TModelController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TModelController.java deleted file mode 100644 index 51749ea..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TModelController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架型号表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-model") -public class TModelController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometristController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOptometristController.java deleted file mode 100644 index 2141fdd..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometristController.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.controller; - - -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 验光师表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@Api(tags = "验光师小程序") -@RequestMapping("/t-optometrist") -public class TOptometristController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryController.java deleted file mode 100644 index 8e18525..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 验光单 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-optometry") -public class TOptometryController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryDetailController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryDetailController.java deleted file mode 100644 index 7b0abc7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOptometryDetailController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 验光单详情 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-optometry-detail") -public class TOptometryDetailController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAccountingController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAccountingController.java deleted file mode 100644 index 3ebd874..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAccountingController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 订单核算表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-order-accounting") -public class TOrderAccountingController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAftersalesController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAftersalesController.java deleted file mode 100644 index ef189be..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderAftersalesController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 订单售后表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-order-aftersales") -public class TOrderAftersalesController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TOrderController.java deleted file mode 100644 index d9a725f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TOrderController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 销售订单表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-order") -public class TOrderController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TStoreController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TStoreController.java deleted file mode 100644 index 9b03f50..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TStoreController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 门店表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-store") -public class TStoreController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TSupplierController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TSupplierController.java deleted file mode 100644 index e5e56ef..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TSupplierController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 供应商 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-supplier") -public class TSupplierController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TTicketController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TTicketController.java deleted file mode 100644 index 0362ec1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TTicketController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 小票机 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-ticket") -public class TTicketController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/controller/TWarehousingController.java b/optometry/src/main/java/com/jilongda/optometry/controller/TWarehousingController.java deleted file mode 100644 index b79617e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/controller/TWarehousingController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 镜架/镜片出库入库表 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@RestController -@RequestMapping("/t-warehousing") -public class TWarehousingController { - -} - diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/AliSms.java b/optometry/src/main/java/com/jilongda/optometry/dto/AliSms.java deleted file mode 100644 index 2b6f19d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/AliSms.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jilongda.optometry.dto; - -import lombok.Data; - -@Data -public class AliSms { - private String code; - private String product; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/AppCustomerPageDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/AppCustomerPageDTO.java deleted file mode 100644 index f80fe41..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/AppCustomerPageDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.jilongda.common.pojo.BasePage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName AppCustomerListDTO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 9:36 - * @Version 1.0 - */ -@Data -@ApiModel("客户收货地址列表") -public class AppCustomerPageDTO extends BasePage { - - @ApiModelProperty("搜索词") - private String keyword; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/AppGoodsSpecDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/AppGoodsSpecDTO.java deleted file mode 100644 index cdc5d91..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/AppGoodsSpecDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName AppGoodsSPecDTO - * @Description TODO - * @Author jqs - * @Date 2024/4/22 14:41 - * @Version 1.0 - */ -@Data -public class AppGoodsSpecDTO { - - @ApiModelProperty(value = "产品id") - private Long goodsId; - - @ApiModelProperty(value = "剂型 1=粉剂,2=颗粒,3=液体") - private Integer goodsDosage; - - @ApiModelProperty(value = "含量") - private String goodsContent; - - @ApiModelProperty(value = "规格") - private String goodsSpecifications; - - @ApiModelProperty(value = "userId",hidden = true) - private Long userId; - - @ApiModelProperty(value = "userType",hidden = true) - private Integer userType; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/AppOrderPageDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/AppOrderPageDTO.java deleted file mode 100644 index 6b120ec..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/AppOrderPageDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.jilongda.common.pojo.BasePage; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName AppOrderPageDTO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 14:41 - * @Version 1.0 - */ -@Data -public class AppOrderPageDTO extends BasePage { - - @ApiModelProperty("订单状态(1待审批,2已通过,3已拒绝,4待发货,5已发货,6.已撤回,7已通过已拒绝)") - private Integer orderStatus; - - @ApiModelProperty("订单类型(1我提交审批订单,2需要我审批订单)") - private Integer orderType; - - @ApiModelProperty(value = "用户id",hidden = true) - private Long userId; - - @ApiModelProperty(value = "用户类型",hidden = true) - private Integer userType; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/AppPassOrderDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/AppPassOrderDTO.java deleted file mode 100644 index 9d034a5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/AppPassOrderDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName AppAuditOrderDTO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 17:01 - * @Version 1.0 - */ -@Data -public class AppPassOrderDTO { - - @ApiModelProperty(value = "订单id") - private Long orderId; - - @ApiModelProperty(value = "审核1通过2拒绝") - private Integer passType; - - @ApiModelProperty(value = "审核备注") - private String passRemark; - - @ApiModelProperty(value = "用户id",hidden = true) - private Long userId; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/Btn.java b/optometry/src/main/java/com/jilongda/optometry/dto/Btn.java deleted file mode 100644 index 6dcb399..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/Btn.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jilongda.optometry.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class Btn implements Serializable { - private String title; - private String name; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/LoginCodeDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/LoginCodeDTO.java deleted file mode 100644 index e907569..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/LoginCodeDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * @Description - * @Author xiaochen - * @Date 2022/6/27/02715:49 - */ -@Data -@ApiModel(value = "短信验证码登录") -public class LoginCodeDTO implements Serializable { - - @ApiModelProperty(value = "手机号") - @NotBlank(message = "手机号不能为空") - private String phone; - - @ApiModelProperty(value = "验证码") - @NotBlank(message = "验证码不能为空") - private String code; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/LoginDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/LoginDTO.java deleted file mode 100644 index 1fc8596..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/LoginDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author xiaochen - * @ClassName LoginDto - * @Description - * @date 2020-08-20 17:52 - */ -@Data -@ApiModel("登录相关dto") -public class LoginDTO { - private String code; - - private String openId; - - @NotBlank(message = "账号不能为空") - private String phone; - - private String password; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/Meta.java b/optometry/src/main/java/com/jilongda/optometry/dto/Meta.java deleted file mode 100644 index 9569ba5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/Meta.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jilongda.optometry.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class Meta implements Serializable { - private String title; - private String parent; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/OptometryLoginDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/OptometryLoginDTO.java deleted file mode 100644 index b5c2382..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/OptometryLoginDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author xiaochen - * @ClassName LoginDto - * @Description - * @date 2020-08-20 17:52 - */ -@Data -@ApiModel("登录相关dto") -public class OptometryLoginDTO { - private String code; - - private String openId; - - @NotBlank(message = "账号不能为空") - private String phone; - - private String password; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/ResetPasswordDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/ResetPasswordDTO.java deleted file mode 100644 index 9b5a611..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/ResetPasswordDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/10/17 14:20 - */ -@Data -public class ResetPasswordDTO { - @ApiModelProperty(value = "账号") - private String phone; - @ApiModelProperty(value = "新密码") -// @Length(min = 6, max = 16, message = "密码长度在8-16之间") - private String password; - @ApiModelProperty(value = "旧密码") - private String oldPassword; - private String id; - private String code; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecResDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecResDTO.java deleted file mode 100644 index d9fb5d6..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecResDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jilongda.optometry.dto; - - -import com.jilongda.applet.model.SecResources; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author xiaochen - * @ClassName SysResDTO - * @Description - * @date 2021-04-20 10:25 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel("资源dto") -public class SecResDTO extends SecResources { -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleDTO.java deleted file mode 100644 index da69d02..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.jilongda.applet.model.SecRole; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 11:35 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel("角色dto") -public class SecRoleDTO extends SecRole { - /** - * 角色id - */ - @ApiModelProperty("角色id") - private Long rid; - /** - * 资源列表 - */ - @ApiModelProperty("资源列表集合") - private List<Long> resourceIds; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleResDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleResDTO.java deleted file mode 100644 index 7f15fd5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecRoleResDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 11:35 - */ -@Data -@ApiModel("角色赋予资源dto") -public class SecRoleResDTO { - /** - * 角色id - */ - @ApiModelProperty("角色id") - private Long rid; - /** - * 资源列表 - */ - @ApiModelProperty("资源列表集合") - private List<Long> resourceIds; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecRolesDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecRolesDTO.java deleted file mode 100644 index 780265e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecRolesDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.jilongda.common.pojo.BasePage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 11:25 - */ -@Data -@ApiModel("角色列表dto请求体") -public class SecRolesDTO extends BasePage { - @ApiModelProperty("角色名称") - private String rolename; - - @ApiModelProperty(value = "角色状态") - private Boolean roleState; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecUserDTO.java deleted file mode 100644 index 673d120..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.dto; - - -import com.jilongda.applet.model.SecUser; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 10:59 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel("管理员账号dto") -public class SecUserDTO extends SecUser { - - @ApiModelProperty("角色id") - private Long roleId; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserQueryDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecUserQueryDTO.java deleted file mode 100644 index 402bf97..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserQueryDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jilongda.common.dto.TimeRangePageDTO; -import com.jilongda.common.pojo.BaseModel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 10:59 - */ -@Data -@ApiModel("用户查询dto") -@JsonIgnoreProperties({BaseModel.UPDATE_TIME}) -public class SecUserQueryDTO extends TimeRangePageDTO { - - @ApiModelProperty("角色id") - private Long id; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserRoleDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecUserRoleDTO.java deleted file mode 100644 index 3839630..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecUserRoleDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - * @Description - * @Author xiaochen - * @Date 2022/6/29/0299:31 - */ -@Data -@ApiModel(value = "人员绑定角色DTO") -public class SecUserRoleDTO implements Serializable { - - @ApiModelProperty(value = "人员id集合") - private List<Long> userIds; - - @ApiModelProperty(value = "角色id") - @NotBlank(message = "角色不可为空") - private Long roleId; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SecUsersDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SecUsersDTO.java deleted file mode 100644 index 4a7d9f1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SecUsersDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.jilongda.optometry.dto; - -import com.jilongda.common.pojo.BasePage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 管理员列表dto对象 - * </p> - * - * @author mouseyCat - * @date 2020/9/3 10:18 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel("管理员列表dto对象") -public class SecUsersDTO extends BasePage { - @ApiModelProperty("姓名") - private String shortName; - @ApiModelProperty("联系方式") - private String phone; - @ApiModelProperty("登陆账号") - private String account; - @ApiModelProperty("人员角色") - private String rolename; - @ApiModelProperty("人员角色id") - private Long roleId; - @ApiModelProperty("状态 true = 禁用 ") - private Boolean state; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesDTO.java deleted file mode 100644 index e0ca347..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jilongda.optometry.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class SysSourcesDTO implements Serializable { - private String icon; - - private String path; - - private String name; - - private String component; - - private Boolean hidden; - - private Meta meta; - - private List<Btn> btn; - - private List<SysSourcesDTO> children; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesListDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesListDTO.java deleted file mode 100644 index 62a20ee..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/SysSourcesListDTO.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jilongda.optometry.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class SysSourcesListDTO implements Serializable { - private List<SysSourcesDTO> menus; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/dto/VerificationCodeDTO.java b/optometry/src/main/java/com/jilongda/optometry/dto/VerificationCodeDTO.java deleted file mode 100644 index b5913c2..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/dto/VerificationCodeDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jilongda.optometry.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import java.io.Serializable; - -/** - * @Description - * @Author xiaochen - * @Date 2022/6/27/02715:33 - */ -@Data -@ApiModel(value = "验证码") -public class VerificationCodeDTO implements Serializable { - - @ApiModelProperty(value = "手机号") - @NotBlank(message = "请输入手机号") - @Length(min = 11, max = 11, message = "手机号只能为11位") - @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") - private String phone; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/log/LoginLogAspect.java b/optometry/src/main/java/com/jilongda/optometry/log/LoginLogAspect.java deleted file mode 100644 index 599f2d1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/log/LoginLogAspect.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.jilongda.optometry.log; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.jilongda.common.log.OperLoginLog; -import com.jilongda.common.log.ParamParser; -import com.jilongda.common.model.LoginLog; -import com.jilongda.common.utils.IPUtil; -import com.jilongda.optometry.security.SecurityUserDetails; -import com.jilongda.optometry.security.SysUserDetailsService; -import com.jilongda.optometry.service.LoginLogService; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; - -import javax.servlet.http.HttpServletRequest; -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.Map; - - -/** - * 切面处理类,登录日志记录处理 - * - * @author xiaochen - * @date 2021/12/21 - */ -@Aspect -@Component -public class LoginLogAspect { - - @Autowired - private LoginLogService loginLogService; - @Autowired - private SysUserDetailsService loadUserDetailsService; - - /** - * 设置操作日志切入点 记录登录日志 在注解的位置切入代码 - */ - @Pointcut("@annotation(com.jilongda.common.log.OperLoginLog)") - public void operLoginLogPoinCut() { - } - - /** - * 正常返回通知,拦截用户登录日志,连接点正常执行完成后执行, 如果连接点抛出异常,则不会执行 - * - * @param joinPoint 切入点 - * @param keys 返回结果 - */ - @AfterReturning(value = "operLoginLogPoinCut()", returning = "keys") - public void saveOperLog(JoinPoint joinPoint, Object keys) { - // 获取RequestAttributes - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - // 从获取RequestAttributes中获取HttpServletRequest的信息 - HttpServletRequest request = (HttpServletRequest) requestAttributes - .resolveReference(RequestAttributes.REFERENCE_REQUEST); - - LoginLog operLoginLog = new LoginLog(); - StringBuilder sb = new StringBuilder(); - try { - // 从切面织入点处通过反射机制获取织入点处的方法 - MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - // 获取切入点所在的方法 - Method method = signature.getMethod(); - // 获取操作 - OperLoginLog opLog = method.getAnnotation(OperLoginLog.class); - - // 操作简述绑定参数 - Object paramParserObj = null; - String requestArgs; - Parameter[] parameters = method.getParameters(); - if (parameters != null && parameters.length > 0) { - for (int i = 0; i < parameters.length; i++) { - ParamParser an = parameters[i].getDeclaredAnnotation(ParamParser.class); - if (an != null) { - paramParserObj = an.value(); - break; - } - } - } - // 不止一个参数 - if (paramParserObj != null) { - requestArgs = sb.append(":").append(paramParserObj).toString(); - } else { - requestArgs = JSONObject.toJSONString(joinPoint.getArgs()); - } - - // 获取openid - String openId = JSONObject.parseArray(requestArgs).getJSONObject(0).getString("openId"); - operLoginLog.setOpenId(openId); - - // 获取当前登录用户信息 - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - String userName = null; -// if (!(authentication instanceof AnonymousAuthenticationToken)) { -// userName = authentication.getName(); -// } - - if (StringUtils.hasLength(userName)) { - // 通过用户名查询该账号信息 - SecurityUserDetails userDetails = loadUserDetailsService.loadUserByUsername(userName); -// operLoginLog.setUserName(userDetails.getShortName()); // 请求用户名称 -// operLoginLog.setAccount(userDetails.getAccount()); // 请求账号 - } - String ip = IPUtil.getIpAddress(request); - operLoginLog.setLoginIp(ip); // 请求IP -// operLoginLog.setLoginAddress(IPAddressUtil.getRealAddress(ip)); // 登录地址,目前服务器带不动 - String address = IPUtil.getUserLocationByIp(); - operLoginLog.setLoginAddress(address); - operLoginLog.setWorkAddress(address); // 工作地 - operLoginLog.setLoginTime(LocalDateTime.now()); // 登录时间 - Long id = IdWorker.getId(); - operLoginLog.setId(id); - loginLogService.save(operLoginLog); - } catch (Exception e) { - e.printStackTrace(); - } - } - - - /** - * 转换request 请求参数 - * - * @param paramMap request获取的参数数组 - */ - public Map<String, String> converMap(Map<String, String[]> paramMap) { - Map<String, String> rtnMap = new HashMap<String, String>(); - for (String key : paramMap.keySet()) { - rtnMap.put(key, paramMap.get(key)[0]); - } - return rtnMap; - } - -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/LoginLogMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/LoginLogMapper.java deleted file mode 100644 index 38896e6..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/LoginLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jilongda.common.model.LoginLog; - -/** - * <p> - * 登录日志 Mapper 接口 - * </p> - * - * @author xiaochen - * @since 2022-09-21 - */ -public interface LoginLogMapper extends BaseMapper<LoginLog> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecFeeItemsMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecFeeItemsMapper.java deleted file mode 100644 index 710f14f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecFeeItemsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecFeeItems; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 系统设置-收费项设置 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecFeeItemsMapper extends BaseMapper<SecFeeItems> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecResourcesMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecResourcesMapper.java deleted file mode 100644 index 2e3463c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecResourcesMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecResources; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 资源表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecResourcesMapper extends BaseMapper<SecResources> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleMapper.java deleted file mode 100644 index 40c9e03..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecRoleMapper extends BaseMapper<SecRole> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleResourceMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleResourceMapper.java deleted file mode 100644 index 9516a5a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecRoleResourceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecRoleResource; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecRoleResourceMapper extends BaseMapper<SecRoleResource> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecSettingMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecSettingMapper.java deleted file mode 100644 index 67d9ae4..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecSettingMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecSetting; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 系统设置 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecSettingMapper extends BaseMapper<SecSetting> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserMapper.java deleted file mode 100644 index 9e27d18..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecUserMapper extends BaseMapper<SecUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserRoleMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserRoleMapper.java deleted file mode 100644 index 426d177..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/SecUserRoleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.SecUserRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecUserRoleMapper extends BaseMapper<SecUserRole> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TAppUserMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TAppUserMapper.java deleted file mode 100644 index 4513144..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TAppUserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TAppUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 用户表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TAppUserMapper extends BaseMapper<TAppUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TBrandMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TBrandMapper.java deleted file mode 100644 index d85afbf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TBrandMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TBrand; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架/镜片品牌表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TBrandMapper extends BaseMapper<TBrand> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponMapper.java deleted file mode 100644 index 742ba71..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TCoupon; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 优惠券领取记录 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TCouponMapper extends BaseMapper<TCoupon> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponReceiveMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponReceiveMapper.java deleted file mode 100644 index 34a5cc3..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TCouponReceiveMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TCouponReceive; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 优惠券 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TCouponReceiveMapper extends BaseMapper<TCouponReceive> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TFrameWarehousingDetailMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TFrameWarehousingDetailMapper.java deleted file mode 100644 index 197815e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TFrameWarehousingDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TFrameWarehousingDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架出库入库详细表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TFrameWarehousingDetailMapper extends BaseMapper<TFrameWarehousingDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryFrameDetailMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryFrameDetailMapper.java deleted file mode 100644 index a41317d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryFrameDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TInventoryFrameDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 材质表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryFrameDetailMapper extends BaseMapper<TInventoryFrameDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryLensDetailMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryLensDetailMapper.java deleted file mode 100644 index 4e95953..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryLensDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TInventoryLensDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架盘点详细表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryLensDetailMapper extends BaseMapper<TInventoryLensDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryMapper.java deleted file mode 100644 index 7feb4ca..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TInventoryMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TInventory; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 盘点表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryMapper extends BaseMapper<TInventory> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TLensSeriesMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TLensSeriesMapper.java deleted file mode 100644 index 94ba4b3..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TLensSeriesMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TLensSeries; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜片系列表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLensSeriesMapper extends BaseMapper<TLensSeries> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TLensWarehousingDetailMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TLensWarehousingDetailMapper.java deleted file mode 100644 index 71d52fa..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TLensWarehousingDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TLensWarehousingDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜片出库入库明细表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLensWarehousingDetailMapper extends BaseMapper<TLensWarehousingDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TLineUpMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TLineUpMapper.java deleted file mode 100644 index 8572b81..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TLineUpMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TLineUp; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 排号管理 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLineUpMapper extends BaseMapper<TLineUp> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TMaterialMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TMaterialMapper.java deleted file mode 100644 index 7bab04d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TMaterialMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TMaterial; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架/镜片品牌表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TMaterialMapper extends BaseMapper<TMaterial> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TModelMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TModelMapper.java deleted file mode 100644 index 4346dba..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TModelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架型号表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TModelMapper extends BaseMapper<TModel> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometristMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometristMapper.java deleted file mode 100644 index cc2b64e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometristMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOptometrist; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 验光师表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometristMapper extends BaseMapper<TOptometrist> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryDetailMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryDetailMapper.java deleted file mode 100644 index ceb5b1e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOptometryDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 验光单详情 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometryDetailMapper extends BaseMapper<TOptometryDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryMapper.java deleted file mode 100644 index 19d212b..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOptometryMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOptometry; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 验光单 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometryMapper extends BaseMapper<TOptometry> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAccountingMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAccountingMapper.java deleted file mode 100644 index 2556e31..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAccountingMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOrderAccounting; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 订单核算表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderAccountingMapper extends BaseMapper<TOrderAccounting> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAftersalesMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAftersalesMapper.java deleted file mode 100644 index a9a0287..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderAftersalesMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOrderAftersales; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 订单售后表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderAftersalesMapper extends BaseMapper<TOrderAftersales> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderMapper.java deleted file mode 100644 index 1ffb482..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TOrderMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TOrder; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 销售订单表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderMapper extends BaseMapper<TOrder> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TStoreMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TStoreMapper.java deleted file mode 100644 index 75db8d0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TStoreMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TStore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 门店表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TStoreMapper extends BaseMapper<TStore> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TSupplierMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TSupplierMapper.java deleted file mode 100644 index b959d9f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TSupplierMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TSupplier; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 供应商 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TSupplierMapper extends BaseMapper<TSupplier> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TTicketMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TTicketMapper.java deleted file mode 100644 index 187c5f0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TTicketMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TTicket; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 小票机 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TTicketMapper extends BaseMapper<TTicket> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TUserMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TUserMapper.java deleted file mode 100644 index dced7af..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TUserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jilongda.common.model.TUser; - -/** - * <p> - * 用户管理 Mapper 接口 - * </p> - * - * @author xiaochen - * @since 2024-04-15 - */ -public interface TUserMapper extends BaseMapper<TUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/mapper/TWarehousingMapper.java b/optometry/src/main/java/com/jilongda/optometry/mapper/TWarehousingMapper.java deleted file mode 100644 index 173c6f9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/mapper/TWarehousingMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.mapper; - -import com.jilongda.optometry.model.TWarehousing; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * 镜架/镜片出库入库表 Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TWarehousingMapper extends BaseMapper<TWarehousing> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecFeeItems.java b/optometry/src/main/java/com/jilongda/optometry/model/SecFeeItems.java deleted file mode 100644 index 9219ca9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecFeeItems.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 系统设置-收费项设置 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_fee_items") -@ApiModel(value="SecFeeItems对象", description="系统设置-收费项设置 ") -public class SecFeeItems implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "收费项名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "手续费比例") - @TableField("percent") - private BigDecimal percent; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecResources.java b/optometry/src/main/java/com/jilongda/optometry/model/SecResources.java deleted file mode 100644 index 57b1845..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecResources.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 资源表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_resources") -@ApiModel(value="SecResources对象", description="资源表") -public class SecResources implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @ApiModelProperty(value = "父级id") - @TableField("parent_id") - private String parentId; - - @ApiModelProperty(value = "资源名") - @TableField("title") - private String title; - - @ApiModelProperty(value = "资源描述") - @TableField("descriptions") - private String descriptions; - - @ApiModelProperty(value = "排序,数字越大越靠后,最小值为0,最大值为100000") - @TableField("sort") - private Integer sort; - - @ApiModelProperty(value = "菜单或按钮图标") - @TableField("icon") - private String icon; - - @ApiModelProperty(value = "前端页面名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "menu") - @TableField("menu") - private String menu; - - @ApiModelProperty(value = "前端文件路径") - @TableField("component") - private String component; - - @ApiModelProperty(value = "针对请求地址是否允许通过,默认不通过,设为通过则不会校验其权限") - @TableField("permit") - private Boolean permit; - - @ApiModelProperty(value = "权限类型,页面-1,按钮-2 默认页面") - @TableField("cate") - private Integer cate; - - @ApiModelProperty(value = "权限类型") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "页面是否隐藏,1是 0否(默认)") - @TableField("hidden") - private Boolean hidden; - - @ApiModelProperty(value = "1前台 2后台") - @TableField("env_port") - private Integer envPort; - - @ApiModelProperty(value = "前端页面路径") - @TableField("path") - private String path; - - @ApiModelProperty(value = "相关接口,多个逗号隔开") - @TableField("api_url") - private String apiUrl; - - @ApiModelProperty(value = "创建人") - @TableField("createBy") - private String createBy; - - @ApiModelProperty(value = "创建时间(注册时间)") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改人") - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @ApiModelProperty(value = "是否删除/禁用 1删除 0否(默认)") - @TableField("isDelete") - private Boolean isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecRole.java b/optometry/src/main/java/com/jilongda/optometry/model/SecRole.java deleted file mode 100644 index c083654..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecRole.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_role") -@ApiModel(value="SecRole对象", description="") -public class SecRole implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @ApiModelProperty(value = "用户组名称") - @TableField("rolename") - private String rolename; - - @ApiModelProperty(value = "角色描述") - @TableField("role_desc") - private String roleDesc; - - @ApiModelProperty(value = "是否启用 1启用 0禁用") - @TableField("role_state") - private Boolean roleState; - - @ApiModelProperty(value = "创建人") - @TableField("createBy") - private String createBy; - - @ApiModelProperty(value = "创建时间(注册时间)") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改人") - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @ApiModelProperty(value = "是否删除/禁用 1删除 0否(默认)") - @TableField("isDelete") - private Boolean isDelete; - - @ApiModelProperty(value = "排序 倒序") - @TableField("sortBy") - private Integer sortBy; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecRoleResource.java b/optometry/src/main/java/com/jilongda/optometry/model/SecRoleResource.java deleted file mode 100644 index 740f097..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecRoleResource.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_role_resource") -@ApiModel(value="SecRoleResource对象", description="") -public class SecRoleResource implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableField("role_id") - private Long roleId; - - @TableField("resource_id") - private Long resourceId; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecSetting.java b/optometry/src/main/java/com/jilongda/optometry/model/SecSetting.java deleted file mode 100644 index f0defbf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecSetting.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 系统设置 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_setting") -@ApiModel(value="SecSetting对象", description="系统设置 ") -public class SecSetting implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "镜片警告阈值") - @TableField("lensThreshold") - private Integer lensThreshold; - - @ApiModelProperty(value = "镜架警告阈值") - @TableField("frameThreshold") - private Integer frameThreshold; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecUser.java b/optometry/src/main/java/com/jilongda/optometry/model/SecUser.java deleted file mode 100644 index 9cc350a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecUser.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_user") -@ApiModel(value="SecUser对象", description="") -public class SecUser implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @ApiModelProperty(value = "账户") - @TableField("account") - private String account; - - @ApiModelProperty(value = "用户描述") - @TableField("description") - private String description; - - @ApiModelProperty(value = "密码") - @TableField("password") - private String password; - - @ApiModelProperty(value = "手机号码") - @TableField("phone") - private String phone; - - @ApiModelProperty(value = "账户状态 是否禁用") - @TableField("state") - private Boolean state; - - @ApiModelProperty(value = "最近一次登陆时间") - @TableField("last_login_time") - private LocalDateTime lastLoginTime; - - @ApiModelProperty(value = "创建人") - @TableField("createBy") - private String createBy; - - @ApiModelProperty(value = "创建时间(注册时间)") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改人") - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @ApiModelProperty(value = "是否删除/禁用 1删除 0否(默认)") - @TableField("isDelete") - private Boolean isDelete; - - @ApiModelProperty(value = "用户昵称") - @TableField("nick_name") - private String nickName; - - @ApiModelProperty(value = "头像地址") - @TableField("avatar_url") - private String avatarUrl; - - @ApiModelProperty(value = "省") - @TableField("province") - private String province; - - @ApiModelProperty(value = "市") - @TableField("city") - private String city; - - @ApiModelProperty(value = "区") - @TableField("area") - private String area; - - @ApiModelProperty(value = "详细地址") - @TableField("address") - private String address; - - @ApiModelProperty(value = "生日") - @TableField("birthday") - private LocalDateTime birthday; - - @ApiModelProperty(value = "1男2女0未知") - @TableField("gender") - private Integer gender; - - @ApiModelProperty(value = "部门id") - @TableField("deptId") - private Long deptId; - - @ApiModelProperty(value = "类型1平台管理员2验光师") - @TableField("userType") - private Integer userType; - - @ApiModelProperty(value = "省code") - @TableField("provinceCode") - private String provinceCode; - - @ApiModelProperty(value = "市code") - @TableField("cityCode") - private String cityCode; - - @ApiModelProperty(value = "区code") - @TableField("areaCode") - private String areaCode; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/SecUserRole.java b/optometry/src/main/java/com/jilongda/optometry/model/SecUserRole.java deleted file mode 100644 index adb4635..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/SecUserRole.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("sec_user_role") -@ApiModel(value="SecUserRole对象", description="") -public class SecUserRole implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "角色id") - @TableField("role_id") - private Long roleId; - - @ApiModelProperty(value = "用户id") - @TableField("user_id") - private Long userId; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TAppUser.java b/optometry/src/main/java/com/jilongda/optometry/model/TAppUser.java deleted file mode 100644 index caedc88..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TAppUser.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 用户表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_app_user") -@ApiModel(value="TAppUser对象", description="用户表") -public class TAppUser implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "微信昵称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "手机号") - @TableField("phone") - private String phone; - - @ApiModelProperty(value = "姓名") - @TableField("realName") - private String realName; - - @ApiModelProperty(value = "年龄") - @TableField("age") - private Integer age; - @ApiModelProperty(value = "微信openId") - @TableField("openId") - private String openId; - @ApiModelProperty(value = "性别1男2女3保密") - @TableField("gender") - private Integer gender; - - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TBrand.java b/optometry/src/main/java/com/jilongda/optometry/model/TBrand.java deleted file mode 100644 index e09ef09..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TBrand.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架/镜片品牌表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_brand") -@ApiModel(value="TBrand对象", description="镜架/镜片品牌表") -public class TBrand implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "品牌名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "类型 1镜架 2镜片") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "是否为主要品牌 1是2否") - @TableField("isMain") - private Integer isMain; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TCoupon.java b/optometry/src/main/java/com/jilongda/optometry/model/TCoupon.java deleted file mode 100644 index 98643cb..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TCoupon.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 优惠券领取记录 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_coupon") -@ApiModel(value="TCoupon对象", description="优惠券领取记录") -public class TCoupon implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "优惠券名称") - @TableField("name") - private Integer name; - - @ApiModelProperty(value = "发放方式 1注册发放 2全局发放 3指定发放 4扫码发放") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "优惠金额") - @TableField("amount") - private BigDecimal amount; - - @ApiModelProperty(value = "门店id 字段为null表示全部") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "有效期(天)最高365") - @TableField("time") - private Integer time; - - @ApiModelProperty(value = "优惠条件金额 为0则表示通用券") - @TableField("amountCondition") - private BigDecimal amountCondition; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "发放状态1发放中 2暂停发放 只有发放方式为1和4的时候存储") - @TableField("grantStatus") - private Integer grantStatus; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TCouponReceive.java b/optometry/src/main/java/com/jilongda/optometry/model/TCouponReceive.java deleted file mode 100644 index 6e93daf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TCouponReceive.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 优惠券 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_coupon_receive") -@ApiModel(value="TCouponReceive对象", description="优惠券") -public class TCouponReceive implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "优惠券id") - @TableField("couponId") - private Integer couponId; - - @ApiModelProperty(value = "用户id") - @TableField("userId") - private Integer userId; - - @ApiModelProperty(value = "发放方式 1注册发放 2全局发放 3指定发放 4扫码发放") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "优惠金额") - @TableField("amount") - private BigDecimal amount; - - @ApiModelProperty(value = "门店id 字段为null表示全部") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "有效期截止日期") - @TableField("endTime") - private LocalDateTime endTime; - - @ApiModelProperty(value = "优惠条件金额 为0则表示通用券") - @TableField("amountCondition") - private BigDecimal amountCondition; - - @ApiModelProperty(value = "1待使用 2已使用 3已过期") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TFrameWarehousingDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TFrameWarehousingDetail.java deleted file mode 100644 index 7f31994..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TFrameWarehousingDetail.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架出库入库详细表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_frame_warehousing_detail") -@ApiModel(value="TFrameWarehousingDetail对象", description="镜架出库入库详细表") -public class TFrameWarehousingDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "入库出库表id") - @TableField("warehousingId") - private Integer warehousingId; - - @ApiModelProperty(value = "品牌") - @TableField("brand") - private String brand; - - @ApiModelProperty(value = "供应商") - @TableField("supplier") - private String supplier; - - @ApiModelProperty(value = "材质") - @TableField("material") - private String material; - - @ApiModelProperty(value = "入库/出库总数量") - @TableField("total") - private Integer total; - - @ApiModelProperty(value = "在库数量(出库没有该字段)") - @TableField("count") - private Integer count; - - @ApiModelProperty(value = "色号") - @TableField("color") - private String color; - - @ApiModelProperty(value = "镜架型号") - @TableField("model") - private String model; - - @ApiModelProperty(value = "入库编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "型号id") - @TableField("modelId") - private Integer modelId; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TInventory.java b/optometry/src/main/java/com/jilongda/optometry/model/TInventory.java deleted file mode 100644 index a0407b7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TInventory.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 盘点表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_inventory") -@ApiModel(value="TInventory对象", description="盘点表") -public class TInventory implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "1型号2品牌3材质4球/柱镜5折射率6系列") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "1镜架2镜片") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "备注") - @TableField("remark") - private String remark; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TInventoryFrameDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TInventoryFrameDetail.java deleted file mode 100644 index d0ea421..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TInventoryFrameDetail.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 材质表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_inventory_frame_detail") -@ApiModel(value="TInventoryFrameDetail对象", description="材质表") -public class TInventoryFrameDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "盘点表id") - @TableField("inventoryId") - private Integer inventoryId; - - @ApiModelProperty(value = "品牌") - @TableField("brand") - private Integer brand; - - @ApiModelProperty(value = "供应商") - @TableField("supplier") - private Integer supplier; - - @ApiModelProperty(value = "材质") - @TableField("material") - private Integer material; - - @ApiModelProperty(value = "库存总数量") - @TableField("total") - private Integer total; - - @ApiModelProperty(value = "盘点类型 1型号2品牌3材质") - @TableField("category") - private Integer category; - - @ApiModelProperty(value = "色号") - @TableField("color") - private String color; - - @ApiModelProperty(value = "镜架型号") - @TableField("model") - private Integer model; - - @ApiModelProperty(value = "盘点数量") - @TableField("count") - private Integer count; - - @ApiModelProperty(value = "差值") - @TableField("diff") - private Integer diff; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TInventoryLensDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TInventoryLensDetail.java deleted file mode 100644 index 56b1e5e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TInventoryLensDetail.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架盘点详细表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_inventory_lens_detail") -@ApiModel(value="TInventoryLensDetail对象", description="镜架盘点详细表") -public class TInventoryLensDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "盘点表id") - @TableField("inventoryId") - private Integer inventoryId; - - @ApiModelProperty(value = "系列") - @TableField("series") - private String series; - - @ApiModelProperty(value = "1球面 2非球面 3双非") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "库存总数量") - @TableField("total") - private Integer total; - - @ApiModelProperty(value = "盘点数量") - @TableField("count") - private Integer count; - - @ApiModelProperty(value = "差值") - @TableField("diff") - private Integer diff; - - @ApiModelProperty(value = "折射率") - @TableField("refractiveIndex") - private String refractiveIndex; - - @ApiModelProperty(value = "球镜") - @TableField("ballMirror") - private String ballMirror; - - @ApiModelProperty(value = "柱镜") - @TableField("columnMirror") - private String columnMirror; - - @ApiModelProperty(value = "盘点类型 1球/柱镜2折射率3系列") - @TableField("category") - private Integer category; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TLensSeries.java b/optometry/src/main/java/com/jilongda/optometry/model/TLensSeries.java deleted file mode 100644 index 7eff42d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TLensSeries.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜片系列表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_lens_series") -@ApiModel(value="TLensSeries对象", description="镜片系列表") -public class TLensSeries implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "系列名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "品牌id") - @TableField("brandId") - private Integer brandId; - - @ApiModelProperty(value = "供应商id") - @TableField("supplierId") - private Integer supplierId; - - @ApiModelProperty(value = "库存类型 1库存 2非库存") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "球面") - @TableField("sphere") - private String sphere; - - @ApiModelProperty(value = "非球面") - @TableField("asphericSurface") - private String asphericSurface; - - @ApiModelProperty(value = "双非") - @TableField("doubleNon") - private String doubleNon; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TLensWarehousingDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TLensWarehousingDetail.java deleted file mode 100644 index 4859bae..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TLensWarehousingDetail.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜片出库入库明细表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_lens_warehousing_detail") -@ApiModel(value="TLensWarehousingDetail对象", description="镜片出库入库明细表") -public class TLensWarehousingDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "品牌") - @TableField("brand") - private String brand; - - @ApiModelProperty(value = "供应商") - @TableField("supplier") - private String supplier; - - @ApiModelProperty(value = "系列") - @TableField("series") - private String series; - - @ApiModelProperty(value = "折射率") - @TableField("refractiveIndex") - private String refractiveIndex; - - @ApiModelProperty(value = "球镜") - @TableField("ballMirror") - private String ballMirror; - - @ApiModelProperty(value = "柱镜") - @TableField("columnMirror") - private String columnMirror; - - @ApiModelProperty(value = "1球面 2非球面 3双非") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "入库/出库数量") - @TableField("total") - private Integer total; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "在库数量(出库没有该字段)") - @TableField("count") - private Integer count; - - @ApiModelProperty(value = "系列id") - @TableField("seriesId") - private Integer seriesId; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TLineUp.java b/optometry/src/main/java/com/jilongda/optometry/model/TLineUp.java deleted file mode 100644 index 1c8a374..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TLineUp.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 排号管理 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_line_up") -@ApiModel(value="TLineUp对象", description="排号管理") -public class TLineUp implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "用户id") - @TableField("userId") - private Integer userId; - - @ApiModelProperty(value = "验光师id") - @TableField("optometristId") - private Integer optometristId; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "状态1排队中2验光中3已完成4已过号5已取消") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TMaterial.java b/optometry/src/main/java/com/jilongda/optometry/model/TMaterial.java deleted file mode 100644 index 046ecf5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TMaterial.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架/镜片品牌表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_material") -@ApiModel(value="TMaterial对象", description="镜架/镜片品牌表") -public class TMaterial implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "材质名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TModel.java b/optometry/src/main/java/com/jilongda/optometry/model/TModel.java deleted file mode 100644 index c66157c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TModel.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架型号表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_model") -@ApiModel(value="TModel对象", description="镜架型号表") -public class TModel implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "品牌id") - @TableField("brandId") - private Integer brandId; - - @ApiModelProperty(value = "供应商id") - @TableField("supplierId") - private Integer supplierId; - - @ApiModelProperty(value = "材质id") - @TableField("materialId") - private Integer materialId; - - @ApiModelProperty(value = "色号 多个逗号拼接") - @TableField("color") - private String color; - - @ApiModelProperty(value = "售价") - @TableField("sale") - private BigDecimal sale; - - @ApiModelProperty(value = "成本价") - @TableField("cost") - private BigDecimal cost; - - @ApiModelProperty(value = "镜架型号") - @TableField("name") - private String name; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOptometrist.java b/optometry/src/main/java/com/jilongda/optometry/model/TOptometrist.java deleted file mode 100644 index 15a6526..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOptometrist.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 验光师表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_optometrist") -@ApiModel(value="TOptometrist对象", description="验光师表") -public class TOptometrist implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "验光师名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "手机号") - @TableField("phone") - private String phone; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "照片") - @TableField("img") - private String img; - - @ApiModelProperty(value = "注册时间") - @TableField("registerTime") - private LocalDateTime registerTime; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOptometry.java b/optometry/src/main/java/com/jilongda/optometry/model/TOptometry.java deleted file mode 100644 index d8cdf81..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOptometry.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 验光单 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_optometry") -@ApiModel(value="TOptometry对象", description="验光单") -public class TOptometry implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "用户id") - @TableField("userId") - private Integer userId; - - @ApiModelProperty(value = "年龄") - @TableField("age") - private Integer age; - - @ApiModelProperty(value = "性别 1男2女") - @TableField("gender") - private Integer gender; - - @ApiModelProperty(value = "姓名") - @TableField("name") - private String name; - - @ApiModelProperty(value = "手机号") - @TableField("phone") - private String phone; - - @ApiModelProperty(value = "验光师id") - @TableField("optometristId") - private Integer optometristId; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "状态1排队中2验光中3已完成4已过号5已取消") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "注册时间") - @TableField("registerTime") - private LocalDateTime registerTime; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java deleted file mode 100644 index 9fecfe7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 验光单详情 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_optometry_detail") -@ApiModel(value="TOptometryDetail对象", description="验光单详情") -public class TOptometryDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "类型1配镜处方 2完全矫正 3旧镜信息") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "验光单id") - @TableField("optometryId") - private Integer optometryId; - - @ApiModelProperty(value = "球镜") - @TableField("ballMirror") - private Double ballMirror; - - @ApiModelProperty(value = "柱镜") - @TableField("columnMirror") - private Double columnMirror; - - @ApiModelProperty(value = "轴位") - @TableField("axis") - private String axis; - - @ApiModelProperty(value = "add") - @TableField("add") - private String add; - - @ApiModelProperty(value = "瞳高") - @TableField("pupilHeight") - private String pupilHeight; - - @ApiModelProperty(value = "瞳距") - @TableField("pupilDistance") - private String pupilDistance; - - @ApiModelProperty(value = "矫正") - @TableField("correct") - private String correct; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "左眼右眼 1为L 2为R") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "注册时间") - @TableField("registerTime") - private LocalDateTime registerTime; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOrder.java b/optometry/src/main/java/com/jilongda/optometry/model/TOrder.java deleted file mode 100644 index fc7b800..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOrder.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 销售订单表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_order") -@ApiModel(value="TOrder对象", description="销售订单表") -public class TOrder implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "用户id") - @TableField("userId") - private Integer userId; - - @ApiModelProperty(value = "验光单id") - @TableField("optometryId") - private Integer optometryId; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "镜架型号id") - @TableField("modelId") - private Integer modelId; - - @ApiModelProperty(value = "镜架色号") - @TableField("color") - private String color; - - @ApiModelProperty(value = "镜片系列id") - @TableField("series") - private Integer series; - - @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带") - @TableField("rLens") - private String rLens; - - @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带") - @TableField("lLens") - private String lLens; - - @ApiModelProperty(value = "1球 2非球面 3双非") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "折射率") - @TableField("refractiveIndex") - private String refractiveIndex; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "店铺员工id") - @TableField("sysId") - private Integer sysId; - - @ApiModelProperty(value = "优惠券id") - @TableField("couponId") - private Integer couponId; - - @ApiModelProperty(value = "收费项id") - @TableField("itemsId") - private Integer itemsId; - - @ApiModelProperty(value = "备注") - @TableField("remark") - private String remark; - - @ApiModelProperty(value = "是否邮寄 1是2否") - @TableField("isMail") - private Integer isMail; - - @ApiModelProperty(value = "收件人姓名") - @TableField("mailName") - private String mailName; - - @ApiModelProperty(value = "收件人电话") - @TableField("mailPhone") - private String mailPhone; - - @ApiModelProperty(value = "收件人地址") - @TableField("mailAddress") - private String mailAddress; - - @ApiModelProperty(value = "订单总金额") - @TableField("orderMoney") - private BigDecimal orderMoney; - - @ApiModelProperty(value = "优惠金额") - @TableField("couponMoney") - private BigDecimal couponMoney; - - @ApiModelProperty(value = "支付金额") - @TableField("payMoney") - private BigDecimal payMoney; - - @ApiModelProperty(value = "是否加工 1是2否") - @TableField("isMachining") - private Integer isMachining; - - @ApiModelProperty(value = "加工编号") - @TableField("machiningCode") - private String machiningCode; - - @ApiModelProperty(value = "是否核算 1是2否") - @TableField("isAccounting") - private Integer isAccounting; - - @ApiModelProperty(value = "核算人") - @TableField("accountingName") - private String accountingName; - - @ApiModelProperty(value = "核算时间") - @TableField("accountingTime") - private LocalDateTime accountingTime; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOrderAccounting.java b/optometry/src/main/java/com/jilongda/optometry/model/TOrderAccounting.java deleted file mode 100644 index e0c73bf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOrderAccounting.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.jilongda.optometry.model; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 订单核算表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_order_accounting") -@ApiModel(value="TOrderAccounting对象", description="订单核算表") -public class TOrderAccounting implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "订单id") - @TableField("orderId") - private Integer orderId; - - @ApiModelProperty(value = "镜片右 核算成本价") - @TableField("rLens") - private BigDecimal rLens; - - @ApiModelProperty(value = "镜片右 核算成本价") - @TableField("lLens") - private BigDecimal lLens; - - @ApiModelProperty(value = "镜架核算成本价") - @TableField("frame") - private BigDecimal frame; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "手续费") - @TableField("commission") - private Integer commission; - - @ApiModelProperty(value = "镜片右毛利") - @TableField("rLensProfit") - private BigDecimal rLensProfit; - - @ApiModelProperty(value = "镜片左毛利") - @TableField("lLensProfit") - private BigDecimal lLensProfit; - - @ApiModelProperty(value = "镜架毛利") - @TableField("frameProfit") - private BigDecimal frameProfit; - - @ApiModelProperty(value = "实收金额") - @TableField("payMoney") - private String payMoney; - - @ApiModelProperty(value = "本单毛利") - @TableField("profitMoney") - private BigDecimal profitMoney; - - @ApiModelProperty(value = "毛利率") - @TableField("profitRating") - private BigDecimal profitRating; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOrderAftersales.java b/optometry/src/main/java/com/jilongda/optometry/model/TOrderAftersales.java deleted file mode 100644 index 7eb283e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TOrderAftersales.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 订单售后表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_order_aftersales") -@ApiModel(value="TOrderAftersales对象", description="订单售后表") -public class TOrderAftersales implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "编号") - @TableField("code") - private String code; - - @ApiModelProperty(value = "店铺员工id") - @TableField("sysId") - private Integer sysId; - - @ApiModelProperty(value = "验光师id") - @TableField("optometristId") - private Integer optometristId; - - @ApiModelProperty(value = "订单id") - @TableField("orderId") - private Integer orderId; - - @ApiModelProperty(value = "售后原因") - @TableField("reason") - private String reason; - - @ApiModelProperty(value = "处理结果") - @TableField("handleResult") - private String handleResult; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TStore.java b/optometry/src/main/java/com/jilongda/optometry/model/TStore.java deleted file mode 100644 index 32191c5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TStore.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 门店表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_store") -@ApiModel(value="TStore对象", description="门店表") -public class TStore implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "门店名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "省") - @TableField("province") - private String province; - - @ApiModelProperty(value = "省code") - @TableField("provinceCode") - private String provinceCode; - - @ApiModelProperty(value = "市") - @TableField("city") - private String city; - - @ApiModelProperty(value = "市code") - @TableField("cityCode") - private String cityCode; - - @ApiModelProperty(value = "区/县") - @TableField("area") - private Integer area; - - @ApiModelProperty(value = "区县code") - @TableField("areaCode") - private String areaCode; - - @ApiModelProperty(value = "地址") - @TableField("address") - private Integer address; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - @ApiModelProperty(value = "经度") - @TableField("lon") - private String lon; - - @ApiModelProperty(value = "纬度") - @TableField("lat") - private String lat; - - @ApiModelProperty(value = "照片") - @TableField("img") - private String img; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TSupplier.java b/optometry/src/main/java/com/jilongda/optometry/model/TSupplier.java deleted file mode 100644 index 47c1fe2..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TSupplier.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 供应商 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_supplier") -@ApiModel(value="TSupplier对象", description="供应商") -public class TSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "供应商名称") - @TableField("name") - private String name; - - @ApiModelProperty(value = "状态 1启用 2禁用") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TTicket.java b/optometry/src/main/java/com/jilongda/optometry/model/TTicket.java deleted file mode 100644 index 7d7a388..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TTicket.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 小票机 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_ticket") -@ApiModel(value="TTicket对象", description="小票机") -public class TTicket implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "小票机名称") - @TableField("name") - private Integer name; - - @ApiModelProperty(value = "类型 1验光单 2加工单") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "云端id") - @TableField("cloudId") - private Integer cloudId; - - @ApiModelProperty(value = "密钥") - @TableField("secret") - private String secret; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TWarehousing.java b/optometry/src/main/java/com/jilongda/optometry/model/TWarehousing.java deleted file mode 100644 index f47ab94..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/model/TWarehousing.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.jilongda.optometry.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p> - * 镜架/镜片出库入库表 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("t_warehousing") -@ApiModel(value="TWarehousing对象", description="镜架/镜片出库入库表") -public class TWarehousing implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "1出库2入库") - @TableField("status") - private Integer status; - - @ApiModelProperty(value = "1镜架2镜片") - @TableField("type") - private Integer type; - - @ApiModelProperty(value = "门店id") - @TableField("storeId") - private Integer storeId; - - @ApiModelProperty(value = "备注") - @TableField("remark") - private String remark; - - @ApiModelProperty(value = "创建时间") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @TableField("createBy") - private String createBy; - - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0否1是") - @TableField("isDelete") - private Integer isDelete; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/query/LoginLogQuery.java b/optometry/src/main/java/com/jilongda/optometry/query/LoginLogQuery.java deleted file mode 100644 index 04e193f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/query/LoginLogQuery.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.query; - -import com.jilongda.common.dto.TimeRangePageDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Description - * @Author xiaochen - * @Date 2022/9/21/02111:52 - */ -@Data -@ApiModel(value = "登录日志Query") -public class LoginLogQuery extends TimeRangePageDTO { - - @ApiModelProperty(value = "登录账号") - private String account; - - @ApiModelProperty(value = "账号名称") - private String shortName; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/query/OperLogQuery.java b/optometry/src/main/java/com/jilongda/optometry/query/OperLogQuery.java deleted file mode 100644 index 8c654cf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/query/OperLogQuery.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.query; - -import com.jilongda.common.dto.TimeRangePageDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Description - * @Author xiaochen - * @Date 2022/9/21/02111:52 - */ -@Data -@ApiModel(value = "操作日志Query") -public class OperLogQuery extends TimeRangePageDTO { - - @ApiModelProperty(value = "操作账号") - private String account; - - @ApiModelProperty(value = "账号名称") - private String shortName; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/schedule/SystemSchedule.java b/optometry/src/main/java/com/jilongda/optometry/schedule/SystemSchedule.java deleted file mode 100644 index 0426b68..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/schedule/SystemSchedule.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.schedule; - -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -/** - * @Description 系统定时任务类 - * @Author xiaochen - * @Date 2022/7/26/02614:00 - */ -@Component -@EnableScheduling -public class SystemSchedule { - - @Scheduled(cron = "0 0 0 ? * SUN") - private void updateProduct() { - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/security/AuthenticationProvider.java b/optometry/src/main/java/com/jilongda/optometry/security/AuthenticationProvider.java deleted file mode 100644 index e28b680..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/security/AuthenticationProvider.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jilongda.optometry.security; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.DisabledException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.password.PasswordEncoder; - -import java.util.Objects; - -/** - * 身份验证提供者--->登录验证逻辑 - * <p> - * 不管是 implements AuthenticationProvider 还是 extends DaoAuthenticationProvider 区别不大 - * <p> - * DaoAuthenticationProvider 实现了 AuthenticationProvider 类 - * <p> - * 验证逻辑都是在 public Authentication authenticate(Authentication authentication) throws AuthenticationException {} 方法中 - * - * @author xiaochen - * @date 2021-01-02 20:17 - */ -@Slf4j -public class AuthenticationProvider extends DaoAuthenticationProvider { - - private SysUserDetailsService loadUserDetailsService; - private PasswordEncoder passwordEncoder; - - public AuthenticationProvider(SysUserDetailsService loadUserDetailsService, PasswordEncoder passwordEncoder) { - this.loadUserDetailsService = loadUserDetailsService; - this.passwordEncoder = passwordEncoder; - setUserDetailsService(loadUserDetailsService); - setPasswordEncoder(passwordEncoder); - } - - @Override - public Authentication authenticate(Authentication authentication) { - // 可以在此处覆写整个登录认证逻辑 - // [1] 获取 username 和 password - String userName = (String) authentication.getPrincipal(); - String password = (String) authentication.getCredentials(); - // [2] 使用用户名从数据库读取用户信息 - SecurityUserDetails userDetails = this.loadUserDetailsService.loadUserByUsername(userName); - // 判断是否被封禁 -// userDetails.setEnabled(userDetails.getStatus()); - // [3] 检查用户信息 - if (Objects.isNull(userDetails)) { - throw new UsernameNotFoundException("用户账户不存在"); - } - else if (userDetails.getState()) { - throw new DisabledException("用户已被禁用或删除,请联系管理员"); - } -// else if (!userDetails.isAccountNonExpired()) { -// throw new AccountExpiredException(userName + " 账号已过期"); -// } else if (!userDetails.isAccountNonLocked()) { -// throw new LockedException(userName + " 账号已被锁定"); -// } else if (!userDetails.isCredentialsNonExpired()) { -// throw new LockedException(userName + " 凭证已过期"); -// } - // [4] 数据库用户的密码,一般都是加密过的 - String encryptedPassword = userDetails.getPassword(); - - // 根据加密算法加密用户输入的密码,然后和数据库中保存的密码进行比较 - if (!this.passwordEncoder.matches(password, encryptedPassword)) { - throw new BadCredentialsException("密码错误"); - } - // [5] 成功登陆,把用户信息提交给 Spring Security - // 把 userDetails 作为 principal 的好处是可以放自定义的 UserDetails,这样可以存储更多有用的信息,而不只是 username, - // 默认只有 username,这里的密码使用数据库中保存的密码,而不是用户输入的明文密码,否则就暴露了密码的明文 - // 不暴露密码 - userDetails.setPassword(null); - UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(userDetails.getUsername(), null, null); - // 设置详情 - //String userInfo = JsonUtils.toJsonString(userDetails); - usernamePasswordAuthenticationToken.setDetails(userDetails); - return usernamePasswordAuthenticationToken; - } - - @Override - protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) - throws AuthenticationException { - // 可以在此处覆写密码验证逻辑 - super.additionalAuthenticationChecks(userDetails, authentication); - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserDetails.java b/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserDetails.java deleted file mode 100644 index 05be610..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserDetails.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jilongda.optometry.security; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.io.Serializable; -import java.util.Collection; - -/** - * @author xiaochen - * @ClassName DinePeopleDetails - * @Description - * @date 2020-08-20 20:36 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SecurityUserDetails extends SecurityUserRoleResouce implements UserDetails, Serializable { - private static final long serialVersionUID = 8154896751339152731L; - @Setter - private Boolean accountNonExpired = true; - @Setter - private Boolean accountNonLocked = true; - @Setter - private Boolean credentialsNonExpired = true; - @Setter - private Boolean enabled = false; - - - /** - * 不在此处做权限校验 - * - * @return - */ - @Override - public Collection<? extends GrantedAuthority> getAuthorities() { - return null; - } - - @Override - public String getPassword() { - return super.getPassword(); - } - - @Override - public String getUsername() { - return super.getAccount(); - } - - @Override - public boolean isAccountNonExpired() { - return this.accountNonExpired; - } - - @Override - public boolean isAccountNonLocked() { - return this.accountNonLocked; - } - - @Override - public boolean isCredentialsNonExpired() { - return this.credentialsNonExpired; - } - - @Override - public boolean isEnabled() { - return this.enabled; - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserRoleResouce.java b/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserRoleResouce.java deleted file mode 100644 index 13fb43b..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/security/SecurityUserRoleResouce.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jilongda.optometry.security; - -import com.jilongda.optometry.model.SecUser; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - * @author xiaochen - * @ClassName SysUserRoleResouce - * @Description - * @date 2021-05-20 15:10 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SecurityUserRoleResouce extends SecUser implements Serializable { -} diff --git a/optometry/src/main/java/com/jilongda/optometry/security/SysUserDetailsService.java b/optometry/src/main/java/com/jilongda/optometry/security/SysUserDetailsService.java deleted file mode 100644 index 0e9a2a4..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/security/SysUserDetailsService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jilongda.optometry.security; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jilongda.common.utils.SpringUtils; -import com.jilongda.optometry.mapper.SecRoleMapper; -import com.jilongda.optometry.mapper.SecUserMapper; -import com.jilongda.optometry.model.SecUser; -import com.jilongda.optometry.service.SecUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Component; - -import java.util.Objects; - - -/** - * 用户登录认证信息查询 - * - * @author xiaochen - * @date Jun 29, 2019 - */ -@Component("loadUserDetailsService") -public class SysUserDetailsService implements UserDetailsService { - @Autowired - private SecUserMapper secUserMapper; - @Autowired - private SecRoleMapper secRoleMapper; -// @Autowired -// private SecResourcesMapper secResourcesMapper; - @Autowired - private SecUserService secUserService; - - - @Override - public SecurityUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - SecUser user = secUserMapper.selectOne(Wrappers.lambdaQuery(SecUser.class).eq(SecUser::getPhone, username).last(" LIMIT 1")); - if (Objects.isNull(user)) { - throw new UsernameNotFoundException("无效手机号码"); - } - SecurityUserDetails vo = SpringUtils.beanCopy(user, SecurityUserDetails.class); -// if (user.getAccount().equals(Constant.ADMIN)) { -// getAdminPermission(vo); -// } else { -// List<SecRole> roles = secRoleMapper.selectRolesByUid(user.getId()); -// List<Long> roleIds = roles.stream().map(SecRole::getId).collect(Collectors.toList()); -// List<SecResourceVO> resources; -// if (CollectionUtils.isEmpty(roleIds)) { -// resources = new ArrayList<>(); -// } else { -// resources = secUserService.getResourceTag(user.getId()); -// } -// vo.setRoles(roles); -// vo.setResources(resources); -// } -// // 更新登录时间 -// SecurityUserDetails securityUserDetails = new SecurityUserDetails(); -// securityUserDetails.setId(user.getId()); -// securityUserDetails.setLastLoginTime(LocalDateTime.now()); -// secUserMapper.updateById(securityUserDetails); - return vo; - } - - - /** - * 为管理员赋所有权限 - * - * @param - * @return - */ -// private SecurityUserDetails getAdminPermission(SecurityUserDetails details) { -// List<SecRole> roles = secRoleMapper.selectList(Wrappers.emptyWrapper()); -// List<SecResourceVO> resources = secUserService.selectUserResourcesTag(details.getId()); -// details.setRoles(roles); -// details.setResources(resources); -// return details; -// } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/LoginLogService.java b/optometry/src/main/java/com/jilongda/optometry/service/LoginLogService.java deleted file mode 100644 index edbdb2d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/LoginLogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jilongda.common.model.LoginLog; - -/** - * <p> - * 登录日志 服务类 - * </p> - * - * @author xiaochen - * @since 2022-09-21 - */ -public interface LoginLogService extends IService<LoginLog> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecFeeItemsService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecFeeItemsService.java deleted file mode 100644 index eb5750b..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecFeeItemsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecFeeItems; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 系统设置-收费项设置 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecFeeItemsService extends IService<SecFeeItems> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecResourcesService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecResourcesService.java deleted file mode 100644 index 44a15a8..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecResourcesService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecResources; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 资源表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecResourcesService extends IService<SecResources> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecRoleResourceService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecRoleResourceService.java deleted file mode 100644 index 5fb855c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecRoleResourceService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecRoleResource; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecRoleResourceService extends IService<SecRoleResource> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecRoleService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecRoleService.java deleted file mode 100644 index 776dce0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecRoleService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecRole; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecRoleService extends IService<SecRole> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecSettingService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecSettingService.java deleted file mode 100644 index c062440..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecSettingService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecSetting; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 系统设置 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecSettingService extends IService<SecSetting> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecUserRoleService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecUserRoleService.java deleted file mode 100644 index a8a67c4..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecUserRoleService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecUserRole; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecUserRoleService extends IService<SecUserRole> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/SecUserService.java b/optometry/src/main/java/com/jilongda/optometry/service/SecUserService.java deleted file mode 100644 index 46aa5b5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/SecUserService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.SecUser; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface SecUserService extends IService<SecUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TAppUserService.java b/optometry/src/main/java/com/jilongda/optometry/service/TAppUserService.java deleted file mode 100644 index e1827a0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TAppUserService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TAppUser; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 用户表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TAppUserService extends IService<TAppUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TBrandService.java b/optometry/src/main/java/com/jilongda/optometry/service/TBrandService.java deleted file mode 100644 index 21abed0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TBrandService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TBrand; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架/镜片品牌表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TBrandService extends IService<TBrand> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TCouponReceiveService.java b/optometry/src/main/java/com/jilongda/optometry/service/TCouponReceiveService.java deleted file mode 100644 index d868d52..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TCouponReceiveService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TCouponReceive; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 优惠券 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TCouponReceiveService extends IService<TCouponReceive> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TCouponService.java b/optometry/src/main/java/com/jilongda/optometry/service/TCouponService.java deleted file mode 100644 index b0458e5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TCouponService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TCoupon; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 优惠券领取记录 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TCouponService extends IService<TCoupon> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TFrameWarehousingDetailService.java b/optometry/src/main/java/com/jilongda/optometry/service/TFrameWarehousingDetailService.java deleted file mode 100644 index bcbf232..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TFrameWarehousingDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TFrameWarehousingDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架出库入库详细表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TFrameWarehousingDetailService extends IService<TFrameWarehousingDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryFrameDetailService.java b/optometry/src/main/java/com/jilongda/optometry/service/TInventoryFrameDetailService.java deleted file mode 100644 index 60daec3..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryFrameDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TInventoryFrameDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 材质表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryFrameDetailService extends IService<TInventoryFrameDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryLensDetailService.java b/optometry/src/main/java/com/jilongda/optometry/service/TInventoryLensDetailService.java deleted file mode 100644 index ad83a60..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryLensDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TInventoryLensDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架盘点详细表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryLensDetailService extends IService<TInventoryLensDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryService.java b/optometry/src/main/java/com/jilongda/optometry/service/TInventoryService.java deleted file mode 100644 index 999386a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TInventoryService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TInventory; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 盘点表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TInventoryService extends IService<TInventory> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TLensSeriesService.java b/optometry/src/main/java/com/jilongda/optometry/service/TLensSeriesService.java deleted file mode 100644 index f054c06..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TLensSeriesService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TLensSeries; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜片系列表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLensSeriesService extends IService<TLensSeries> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TLensWarehousingDetailService.java b/optometry/src/main/java/com/jilongda/optometry/service/TLensWarehousingDetailService.java deleted file mode 100644 index 6e0ac9f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TLensWarehousingDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TLensWarehousingDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜片出库入库明细表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLensWarehousingDetailService extends IService<TLensWarehousingDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TLineUpService.java b/optometry/src/main/java/com/jilongda/optometry/service/TLineUpService.java deleted file mode 100644 index f9b96bc..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TLineUpService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TLineUp; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 排号管理 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TLineUpService extends IService<TLineUp> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TMaterialService.java b/optometry/src/main/java/com/jilongda/optometry/service/TMaterialService.java deleted file mode 100644 index 757979c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TMaterialService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TMaterial; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架/镜片品牌表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TMaterialService extends IService<TMaterial> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TModelService.java b/optometry/src/main/java/com/jilongda/optometry/service/TModelService.java deleted file mode 100644 index 188524e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TModelService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TModel; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架型号表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TModelService extends IService<TModel> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOptometristService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOptometristService.java deleted file mode 100644 index 3788848..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOptometristService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOptometrist; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 验光师表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometristService extends IService<TOptometrist> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOptometryDetailService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOptometryDetailService.java deleted file mode 100644 index 185ade0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOptometryDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOptometryDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 验光单详情 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometryDetailService extends IService<TOptometryDetail> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOptometryService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOptometryService.java deleted file mode 100644 index e0c2985..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOptometryService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOptometry; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 验光单 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOptometryService extends IService<TOptometry> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOrderAccountingService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOrderAccountingService.java deleted file mode 100644 index a97e60b..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOrderAccountingService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOrderAccounting; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 订单核算表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderAccountingService extends IService<TOrderAccounting> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOrderAftersalesService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOrderAftersalesService.java deleted file mode 100644 index 8755045..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOrderAftersalesService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOrderAftersales; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 订单售后表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderAftersalesService extends IService<TOrderAftersales> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TOrderService.java b/optometry/src/main/java/com/jilongda/optometry/service/TOrderService.java deleted file mode 100644 index 3c869c8..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TOrderService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TOrder; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 销售订单表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TOrderService extends IService<TOrder> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TStoreService.java b/optometry/src/main/java/com/jilongda/optometry/service/TStoreService.java deleted file mode 100644 index eb943a8..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TStoreService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TStore; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 门店表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TStoreService extends IService<TStore> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TSupplierService.java b/optometry/src/main/java/com/jilongda/optometry/service/TSupplierService.java deleted file mode 100644 index 13604e8..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TSupplierService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TSupplier; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 供应商 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TSupplierService extends IService<TSupplier> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TTicketService.java b/optometry/src/main/java/com/jilongda/optometry/service/TTicketService.java deleted file mode 100644 index 0a6416d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TTicketService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TTicket; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 小票机 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TTicketService extends IService<TTicket> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TUserService.java b/optometry/src/main/java/com/jilongda/optometry/service/TUserService.java deleted file mode 100644 index 3977946..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TUserService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jilongda.common.model.TUser; - -/** - * <p> - * 用户管理 服务类 - * </p> - * - * @author xiaochen - * @since 2024-04-15 - */ -public interface TUserService extends IService<TUser> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/TWarehousingService.java b/optometry/src/main/java/com/jilongda/optometry/service/TWarehousingService.java deleted file mode 100644 index d0ef102..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/TWarehousingService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jilongda.optometry.service; - -import com.jilongda.optometry.model.TWarehousing; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 镜架/镜片出库入库表 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -public interface TWarehousingService extends IService<TWarehousing> { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/LoginLogServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/LoginLogServiceImpl.java deleted file mode 100644 index 4a26ac9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/LoginLogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jilongda.common.model.LoginLog; -import com.jilongda.optometry.mapper.LoginLogMapper; -import com.jilongda.optometry.service.LoginLogService; -import org.springframework.stereotype.Service; - -/** - * <p> - * 登录日志 服务实现类 - * </p> - * - * @author xiaochen - * @since 2022-09-21 - */ -@Service -public class LoginLogServiceImpl extends ServiceImpl<LoginLogMapper, LoginLog> implements LoginLogService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecFeeItemsServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecFeeItemsServiceImpl.java deleted file mode 100644 index 9c44fad..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecFeeItemsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecFeeItems; -import com.jilongda.optometry.mapper.SecFeeItemsMapper; -import com.jilongda.optometry.service.SecFeeItemsService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 系统设置-收费项设置 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecFeeItemsServiceImpl extends ServiceImpl<SecFeeItemsMapper, SecFeeItems> implements SecFeeItemsService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecResourcesServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecResourcesServiceImpl.java deleted file mode 100644 index 0b1049e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecResourcesServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecResources; -import com.jilongda.optometry.mapper.SecResourcesMapper; -import com.jilongda.optometry.service.SecResourcesService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 资源表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecResourcesServiceImpl extends ServiceImpl<SecResourcesMapper, SecResources> implements SecResourcesService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleResourceServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleResourceServiceImpl.java deleted file mode 100644 index 413fcfb..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleResourceServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecRoleResource; -import com.jilongda.optometry.mapper.SecRoleResourceMapper; -import com.jilongda.optometry.service.SecRoleResourceService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecRoleResourceServiceImpl extends ServiceImpl<SecRoleResourceMapper, SecRoleResource> implements SecRoleResourceService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleServiceImpl.java deleted file mode 100644 index f630d6d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecRoleServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecRole; -import com.jilongda.optometry.mapper.SecRoleMapper; -import com.jilongda.optometry.service.SecRoleService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecRoleServiceImpl extends ServiceImpl<SecRoleMapper, SecRole> implements SecRoleService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecSettingServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecSettingServiceImpl.java deleted file mode 100644 index 055e5ec..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecSettingServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecSetting; -import com.jilongda.optometry.mapper.SecSettingMapper; -import com.jilongda.optometry.service.SecSettingService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 系统设置 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecSettingServiceImpl extends ServiceImpl<SecSettingMapper, SecSetting> implements SecSettingService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserRoleServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserRoleServiceImpl.java deleted file mode 100644 index 32e4305..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserRoleServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecUserRole; -import com.jilongda.optometry.mapper.SecUserRoleMapper; -import com.jilongda.optometry.service.SecUserRoleService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecUserRoleServiceImpl extends ServiceImpl<SecUserRoleMapper, SecUserRole> implements SecUserRoleService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserServiceImpl.java deleted file mode 100644 index d839fc7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/SecUserServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.SecUser; -import com.jilongda.optometry.mapper.SecUserMapper; -import com.jilongda.optometry.service.SecUserService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class SecUserServiceImpl extends ServiceImpl<SecUserMapper, SecUser> implements SecUserService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TAppUserServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TAppUserServiceImpl.java deleted file mode 100644 index 54e8af8..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TAppUserServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TAppUser; -import com.jilongda.optometry.mapper.TAppUserMapper; -import com.jilongda.optometry.service.TAppUserService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 用户表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TBrandServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TBrandServiceImpl.java deleted file mode 100644 index 5da39ae..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TBrandServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TBrand; -import com.jilongda.optometry.mapper.TBrandMapper; -import com.jilongda.optometry.service.TBrandService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架/镜片品牌表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TBrandServiceImpl extends ServiceImpl<TBrandMapper, TBrand> implements TBrandService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponReceiveServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponReceiveServiceImpl.java deleted file mode 100644 index fd68ce6..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponReceiveServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TCouponReceive; -import com.jilongda.optometry.mapper.TCouponReceiveMapper; -import com.jilongda.optometry.service.TCouponReceiveService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 优惠券 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TCouponReceiveServiceImpl extends ServiceImpl<TCouponReceiveMapper, TCouponReceive> implements TCouponReceiveService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponServiceImpl.java deleted file mode 100644 index cf42efa..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TCouponServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TCoupon; -import com.jilongda.optometry.mapper.TCouponMapper; -import com.jilongda.optometry.service.TCouponService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 优惠券领取记录 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TCouponServiceImpl extends ServiceImpl<TCouponMapper, TCoupon> implements TCouponService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TFrameWarehousingDetailServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TFrameWarehousingDetailServiceImpl.java deleted file mode 100644 index c783795..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TFrameWarehousingDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TFrameWarehousingDetail; -import com.jilongda.optometry.mapper.TFrameWarehousingDetailMapper; -import com.jilongda.optometry.service.TFrameWarehousingDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架出库入库详细表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TFrameWarehousingDetailServiceImpl extends ServiceImpl<TFrameWarehousingDetailMapper, TFrameWarehousingDetail> implements TFrameWarehousingDetailService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryFrameDetailServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryFrameDetailServiceImpl.java deleted file mode 100644 index 8318766..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryFrameDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TInventoryFrameDetail; -import com.jilongda.optometry.mapper.TInventoryFrameDetailMapper; -import com.jilongda.optometry.service.TInventoryFrameDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 材质表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TInventoryFrameDetailServiceImpl extends ServiceImpl<TInventoryFrameDetailMapper, TInventoryFrameDetail> implements TInventoryFrameDetailService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryLensDetailServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryLensDetailServiceImpl.java deleted file mode 100644 index 2e48e15..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryLensDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TInventoryLensDetail; -import com.jilongda.optometry.mapper.TInventoryLensDetailMapper; -import com.jilongda.optometry.service.TInventoryLensDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架盘点详细表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TInventoryLensDetailServiceImpl extends ServiceImpl<TInventoryLensDetailMapper, TInventoryLensDetail> implements TInventoryLensDetailService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryServiceImpl.java deleted file mode 100644 index e8daaae..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TInventoryServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TInventory; -import com.jilongda.optometry.mapper.TInventoryMapper; -import com.jilongda.optometry.service.TInventoryService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 盘点表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TInventoryServiceImpl extends ServiceImpl<TInventoryMapper, TInventory> implements TInventoryService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensSeriesServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensSeriesServiceImpl.java deleted file mode 100644 index 2dd0231..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensSeriesServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TLensSeries; -import com.jilongda.optometry.mapper.TLensSeriesMapper; -import com.jilongda.optometry.service.TLensSeriesService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜片系列表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TLensSeriesServiceImpl extends ServiceImpl<TLensSeriesMapper, TLensSeries> implements TLensSeriesService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensWarehousingDetailServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensWarehousingDetailServiceImpl.java deleted file mode 100644 index 5f6299e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLensWarehousingDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TLensWarehousingDetail; -import com.jilongda.optometry.mapper.TLensWarehousingDetailMapper; -import com.jilongda.optometry.service.TLensWarehousingDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜片出库入库明细表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TLensWarehousingDetailServiceImpl extends ServiceImpl<TLensWarehousingDetailMapper, TLensWarehousingDetail> implements TLensWarehousingDetailService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLineUpServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TLineUpServiceImpl.java deleted file mode 100644 index 392a65d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TLineUpServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TLineUp; -import com.jilongda.optometry.mapper.TLineUpMapper; -import com.jilongda.optometry.service.TLineUpService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 排号管理 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TLineUpServiceImpl extends ServiceImpl<TLineUpMapper, TLineUp> implements TLineUpService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TMaterialServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TMaterialServiceImpl.java deleted file mode 100644 index 7616ed1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TMaterialServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TMaterial; -import com.jilongda.optometry.mapper.TMaterialMapper; -import com.jilongda.optometry.service.TMaterialService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架/镜片品牌表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TMaterialServiceImpl extends ServiceImpl<TMaterialMapper, TMaterial> implements TMaterialService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TModelServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TModelServiceImpl.java deleted file mode 100644 index e346091..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TModelServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TModel; -import com.jilongda.optometry.mapper.TModelMapper; -import com.jilongda.optometry.service.TModelService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架型号表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TModelServiceImpl extends ServiceImpl<TModelMapper, TModel> implements TModelService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometristServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometristServiceImpl.java deleted file mode 100644 index 8b9bee7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometristServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOptometrist; -import com.jilongda.optometry.mapper.TOptometristMapper; -import com.jilongda.optometry.service.TOptometristService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 验光师表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOptometristServiceImpl extends ServiceImpl<TOptometristMapper, TOptometrist> implements TOptometristService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryDetailServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryDetailServiceImpl.java deleted file mode 100644 index 7712364..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOptometryDetail; -import com.jilongda.optometry.mapper.TOptometryDetailMapper; -import com.jilongda.optometry.service.TOptometryDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 验光单详情 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOptometryDetailServiceImpl extends ServiceImpl<TOptometryDetailMapper, TOptometryDetail> implements TOptometryDetailService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryServiceImpl.java deleted file mode 100644 index fb01558..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOptometryServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOptometry; -import com.jilongda.optometry.mapper.TOptometryMapper; -import com.jilongda.optometry.service.TOptometryService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 验光单 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOptometryServiceImpl extends ServiceImpl<TOptometryMapper, TOptometry> implements TOptometryService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAccountingServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAccountingServiceImpl.java deleted file mode 100644 index c6176ac..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAccountingServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOrderAccounting; -import com.jilongda.optometry.mapper.TOrderAccountingMapper; -import com.jilongda.optometry.service.TOrderAccountingService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 订单核算表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOrderAccountingServiceImpl extends ServiceImpl<TOrderAccountingMapper, TOrderAccounting> implements TOrderAccountingService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAftersalesServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAftersalesServiceImpl.java deleted file mode 100644 index c6c9497..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderAftersalesServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOrderAftersales; -import com.jilongda.optometry.mapper.TOrderAftersalesMapper; -import com.jilongda.optometry.service.TOrderAftersalesService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 订单售后表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOrderAftersalesServiceImpl extends ServiceImpl<TOrderAftersalesMapper, TOrderAftersales> implements TOrderAftersalesService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderServiceImpl.java deleted file mode 100644 index d97d7f5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TOrderServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TOrder; -import com.jilongda.optometry.mapper.TOrderMapper; -import com.jilongda.optometry.service.TOrderService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 销售订单表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TStoreServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TStoreServiceImpl.java deleted file mode 100644 index da1a81d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TStoreServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TStore; -import com.jilongda.optometry.mapper.TStoreMapper; -import com.jilongda.optometry.service.TStoreService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 门店表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TStoreServiceImpl extends ServiceImpl<TStoreMapper, TStore> implements TStoreService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TSupplierServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TSupplierServiceImpl.java deleted file mode 100644 index 4e31e52..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TSupplierServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TSupplier; -import com.jilongda.optometry.mapper.TSupplierMapper; -import com.jilongda.optometry.service.TSupplierService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 供应商 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TSupplierServiceImpl extends ServiceImpl<TSupplierMapper, TSupplier> implements TSupplierService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TTicketServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TTicketServiceImpl.java deleted file mode 100644 index 8cb93d0..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TTicketServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TTicket; -import com.jilongda.optometry.mapper.TTicketMapper; -import com.jilongda.optometry.service.TTicketService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 小票机 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TTicketServiceImpl extends ServiceImpl<TTicketMapper, TTicket> implements TTicketService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TUserServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TUserServiceImpl.java deleted file mode 100644 index cba9fe1..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TUserServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jilongda.common.model.TUser; -import com.jilongda.optometry.mapper.TUserMapper; -import com.jilongda.optometry.service.TUserService; -import org.springframework.stereotype.Service; - -/** - * <p> - * 用户管理 服务实现类 - * </p> - * - * @author xiaochen - * @since 2024-04-15 - */ -@Service -public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/service/impl/TWarehousingServiceImpl.java b/optometry/src/main/java/com/jilongda/optometry/service/impl/TWarehousingServiceImpl.java deleted file mode 100644 index ae98945..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/service/impl/TWarehousingServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jilongda.optometry.service.impl; - -import com.jilongda.optometry.model.TWarehousing; -import com.jilongda.optometry.mapper.TWarehousingMapper; -import com.jilongda.optometry.service.TWarehousingService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 镜架/镜片出库入库表 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-12-09 - */ -@Service -public class TWarehousingServiceImpl extends ServiceImpl<TWarehousingMapper, TWarehousing> implements TWarehousingService { - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/ALiSendSms.java b/optometry/src/main/java/com/jilongda/optometry/utils/ALiSendSms.java deleted file mode 100644 index 884c101..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/ALiSendSms.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jilongda.optometry.utils; - - -import com.aliyuncs.CommonRequest; -import com.aliyuncs.CommonResponse; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.profile.DefaultProfile; -import com.google.gson.Gson; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * 阿里云短信工具类 - */ -@Component -public class ALiSendSms { - - // 设置鉴权参数,初始化客户端 - private DefaultProfile profile = DefaultProfile.getProfile( - "cn-hangzhou",// 地域ID - "LTAIFS7hF89c6zw9",// 您的AccessKey ID - "CRGQq3oo5IcKxdUOOki60lOvo0fCHs");// 您的AccessKey Secret - private IAcsClient client = new DefaultAcsClient(profile); - - private static void log_print(String functionName, Object result) { - Gson gson = new Gson(); - System.out.println("-------------------------------" + functionName + "-------------------------------"); - System.out.println(gson.toJson(result)); - } - - /** - * 添加短信模板 - */ - public String addSmsTemplate() throws ClientException { - CommonRequest addSmsTemplateRequest = new CommonRequest(); - addSmsTemplateRequest.setSysDomain("dysmsapi.aliyuncs.com"); - addSmsTemplateRequest.setSysAction("AddSmsTemplate"); - addSmsTemplateRequest.setSysVersion("2017-05-25"); - // 短信类型。0:验证码;1:短信通知;2:推广短信;3:国际/港澳台消息 - addSmsTemplateRequest.putQueryParameter("TemplateType", "0"); - // 模板名称,长度为1~30个字符 - addSmsTemplateRequest.putQueryParameter("TemplateName", "测试短信模板"); - // 模板内容,长度为1~500个字符 - addSmsTemplateRequest.putQueryParameter("TemplateContent", "您正在申请手机注册,验证码为:${code},5分钟内有效!"); - // 短信模板申请说明 - addSmsTemplateRequest.putQueryParameter("Remark", "测试"); - CommonResponse addSmsTemplateResponse = client.getCommonResponse(addSmsTemplateRequest); - String data = addSmsTemplateResponse.getData(); - // 消除返回文本中的反转义字符 - String sData = data.replaceAll("'\'", ""); - log_print("addSmsTemplate", sData); - Gson gson = new Gson(); - // 将字符串转换为Map类型,取TemplateCode字段值 - Map map = gson.fromJson(sData, Map.class); - Object templateCode = map.get("TemplateCode"); - return templateCode.toString(); - } - - /** - * 发送短信 - */ - public String sendSms(String phone, String templateCode, String json) throws ClientException { - CommonRequest request = new CommonRequest(); - request.setSysDomain("dysmsapi.aliyuncs.com"); - request.setSysVersion("2017-05-25"); - request.setSysAction("SendSms"); - // 接收短信的手机号码 - request.putQueryParameter("PhoneNumbers", phone); - // 短信签名名称。请在控制台签名管理页面签名名称一列查看(必须是已添加、并通过审核的短信签名)。 - request.putQueryParameter("SignName", "吉隆达"); - // 短信模板ID - request.putQueryParameter("TemplateCode", templateCode); - // 短信模板变量对应的实际值,JSON格式。 - request.putQueryParameter("TemplateParam", json); - CommonResponse commonResponse = client.getCommonResponse(request); - String data = commonResponse.getData(); - String sData = data.replaceAll("'\'", ""); - log_print("sendSms", sData); - return sData; - } - - /** - * 查询发送详情 - */ - private void querySendDetails(String bizId) throws ClientException { - CommonRequest request = new CommonRequest(); - request.setSysDomain("dysmsapi.aliyuncs.com"); - request.setSysVersion("2017-05-25"); - request.setSysAction("QuerySendDetails"); - // 接收短信的手机号码 - request.putQueryParameter("PhoneNumber", "156xxxxxxxx"); - // 短信发送日期,支持查询最近30天的记录。格式为yyyyMMdd,例如20191010。 - request.putQueryParameter("SendDate", "20191010"); - // 分页记录数量 - request.putQueryParameter("PageSize", "10"); - // 分页当前页码 - request.putQueryParameter("CurrentPage", "1"); - // 发送回执ID,即发送流水号。 - request.putQueryParameter("BizId", bizId); - CommonResponse response = client.getCommonResponse(request); - log_print("querySendDetails", response.getData()); - } - - public static void main(String[] args) { - ALiSendSms sendSmsDemo = new ALiSendSms(); - try { - // 创建短信模板 -// String templateCode = sendSmsDemo.addSmsTemplate(); - // 使用刚创建的短信模板发送短信 - String sData = sendSmsDemo.sendSms("19522115070", "SMS_58880127", "{\"code\":\"8888\",\"product\":\"111\" }"); - Gson gson = new Gson(); - Map map = gson.fromJson(sData, Map.class); - String bizId = map.get("BizId").toString(); - // 根据短信发送流水号查询短信发送情况 - sendSmsDemo.querySendDetails(bizId); - } catch (ClientException e) { - e.printStackTrace(); - } - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/DistanceCalculator.java b/optometry/src/main/java/com/jilongda/optometry/utils/DistanceCalculator.java deleted file mode 100644 index 7ebce0a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/DistanceCalculator.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jilongda.optometry.utils; - -public class DistanceCalculator { - public static void main(String[] args) { - String coord1 = "40.7128"; - String coord2 = "-74.0060"; - String coord3 = "34.0522"; - String coord4 = "-118.2437"; - - double distance = calculateDistance(coord1, coord2, coord3, coord4); - System.out.println("两个坐标点的距离为: " + distance + " km"); - } - - public static double calculateDistance(String lat1, String lon1, String lat2, String lon2) { - double lat1Double = Double.parseDouble(lat1); - double lon1Double = Double.parseDouble(lon1); - double lat2Double = Double.parseDouble(lat2); - double lon2Double = Double.parseDouble(lon2); - - int R = 6371; // 地球半径,单位:km - double latDistance = Math.toRadians(lat2Double - lat1Double); - double lonDistance = Math.toRadians(lon2Double - lon1Double); - double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2) - + Math.cos(Math.toRadians(lat1Double)) * Math.cos(Math.toRadians(lat2Double)) - * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2); - double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); - return R * c; - } -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/LoginInfoUtil.java b/optometry/src/main/java/com/jilongda/optometry/utils/LoginInfoUtil.java deleted file mode 100644 index 65e6f0f..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/LoginInfoUtil.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jilongda.optometry.utils; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jilongda.common.model.TUser; -import com.jilongda.common.security.JwtTokenUtils; -import com.jilongda.optometry.model.SecUser; -import com.jilongda.optometry.service.SecUserService; -import com.jilongda.optometry.service.TUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class LoginInfoUtil { - - @Autowired - private TUserService tUserService; - - @Autowired - private SecUserService secUserService; - - - - - - public Long getUserId1(){ - String username = JwtTokenUtils.getUsername(); - TUser userName = tUserService.getOne(new QueryWrapper<TUser>().eq("userName", username).eq("isDelete",0)); - return userName.getId(); - - } - public Long getUserId(){ - String username = JwtTokenUtils.getUsername(); - SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); - return userName.getId(); - - } - public SecUser getLoginUserByPhone(){ - String username = JwtTokenUtils.getUsername(); - SecUser tUser = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); - return tUser; - } - - public SecUser getLoginUser(){ - String username = JwtTokenUtils.getUsername(); - SecUser secUser = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); - return secUser; - } - - public Integer getUserType(){ - String username = JwtTokenUtils.getUsername(); - SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); - return userName.getUserType(); - - } - - /** - * @description 注销 - * @author jqs - * @date 2024/4/18 10:26 - * @param - * @return void - */ - public void logoff(){ - String username = JwtTokenUtils.getUsername(); - SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); - userName.setIsDelete(true); - secUserService.saveOrUpdate(userName); - } - - public Boolean checkPhoneExits(String phone){ - SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", phone).eq("isDelete",0)); - if(userName!=null){ - return true; - }else{ - return false; - } - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/MsgUtils.java b/optometry/src/main/java/com/jilongda/optometry/utils/MsgUtils.java deleted file mode 100644 index 815cb02..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/MsgUtils.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.jilongda.optometry.utils; - -import com.aliyun.dysmsapi20170525.models.SendSmsRequest; -import com.aliyun.dysmsapi20170525.models.SendSmsResponse; -import com.aliyun.tea.TeaException; -import com.aliyun.teaopenapi.models.Config; -import com.aliyun.teautil.models.RuntimeOptions; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class MsgUtils { - - @Value("${oss.config.accessKeyId}") - private String accessKeyId; - @Value("${oss.config.accessKeySecret}") - private String accessKeySecret; - @Value("${oss.config.signName}") - private String signName; - @Value("${oss.config.templateCode}") - private String templateCode; - @Value("${oss.config.signNameTest}") - private String signNameTest; - @Value("${oss.config.templateCodeTest}") - private String templateCodeTest; - - @Value("${oss.config.shareTemplateCode}") - private String shareTemplateCode; - - /** - * 使用AK&SK初始化账号Client - * @param accessKeyId - * @param accessKeySecret - * @return Client - * @throws Exception - */ - public static com.aliyun.dysmsapi20170525.Client createClient(String accessKeyId, String accessKeySecret) throws Exception { - Config config = new Config() - // 您的 AccessKey ID - .setAccessKeyId(accessKeyId) - // 您的 AccessKey Secret - .setAccessKeySecret(accessKeySecret); - // 访问的域名 - config.endpoint = "dysmsapi.aliyuncs.com"; - return new com.aliyun.dysmsapi20170525.Client(config); - } - - public void sendMsg(String phone,String code) throws Exception { - com.aliyun.dysmsapi20170525.Client client = MsgUtils.createClient(accessKeyId,accessKeySecret); - SendSmsRequest sendSmsRequest = new SendSmsRequest() - .setSignName(signName) - .setTemplateCode(templateCode) - .setPhoneNumbers(phone) - .setTemplateParam("{\"code\":\""+code+"\"}"); - RuntimeOptions runtime = new RuntimeOptions(); - try { - // 复制代码运行请自行打印 API 的返回值 - SendSmsResponse sendSmsResponse = client.sendSmsWithOptions(sendSmsRequest, runtime); - log.info("短信发送成功:{},{}",sendSmsResponse.getBody().getMessage(),sendSmsResponse.getStatusCode()); - } catch (TeaException error) { - // 如有需要,请打印 error - com.aliyun.teautil.Common.assertAsString(error.message); - log.info("短信发送失败:{}",error.message); - } catch (Exception _error) { - TeaException error = new TeaException(_error.getMessage(), _error); - // 如有需要,请打印 error - com.aliyun.teautil.Common.assertAsString(error.message); - log.info("短信发送失败:{}",error.message); - } - } - - public void sendMsg(String phone,String name,String time,String content) throws Exception { - com.aliyun.dysmsapi20170525.Client client = MsgUtils.createClient(accessKeyId,accessKeySecret); - SendSmsRequest sendSmsRequest = new SendSmsRequest() - .setSignName(signName) - .setTemplateCode(shareTemplateCode) - .setPhoneNumbers(phone) - .setTemplateParam("{\"name\":\""+name+"\",\"time\":\""+time+"\",\"content\":\""+content+"\"}"); - RuntimeOptions runtime = new RuntimeOptions(); - try { - // 复制代码运行请自行打印 API 的返回值 - SendSmsResponse sendSmsResponse = client.sendSmsWithOptions(sendSmsRequest, runtime); - log.info("短信发送成功:{},{}",sendSmsResponse.getBody().getMessage(),sendSmsResponse.getStatusCode()); - } catch (TeaException error) { - // 如有需要,请打印 error - com.aliyun.teautil.Common.assertAsString(error.message); - log.info("短信发送失败:{}",error.message); - } catch (Exception _error) { - TeaException error = new TeaException(_error.getMessage(), _error); - // 如有需要,请打印 error - com.aliyun.teautil.Common.assertAsString(error.message); - log.info("短信发送失败:{}",error.message); - } - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/ObsUploadUtil.java b/optometry/src/main/java/com/jilongda/optometry/utils/ObsUploadUtil.java deleted file mode 100644 index 8aa7fc9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/ObsUploadUtil.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.jilongda.optometry.utils; - -import com.obs.services.ObsClient; -import com.obs.services.model.ObjectMetadata; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.io.InputStream; -import java.util.UUID; - -public class ObsUploadUtil { - //OBS图片访问域名 - public static String endPoint = "obs.cn-southwest-2.myhuaweicloud.com"; - public static String accessKeyId = "BS5OIYJTSJGGVGRTOG2I"; - public static String accessKeySecret = "a8EP93DlqpPeYpFGiYHqjjubOEpt1d0ovIP1L3YL"; - public static String bucketName = "cqzxtaxi"; - public static String oss_domain = "https://cqzxtaxi.obs.cn-southwest-2.myhuaweicloud.com/"; - - // 创建ObsClient实例 - public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint); - - public static String obsUpload(MultipartFile file) throws IOException{ - //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile; - String fileName = ""; - if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){ - InputStream content = file.getInputStream();//获得指定文件的输入流 - ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata - meta.setContentLength(file.getSize()); // 必须设置ContentLength - String originalFilename = file.getOriginalFilename(); - fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length()); - obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object. - if(fileName != null && !"".equals(fileName)){ - System.out.println(fileName); - fileName = oss_domain+"admin/"+fileName; - } - } - return fileName; - } - - /** - * 删除某个Object - * - * @param bucketUrl - * @return - */ - public static boolean deleteObject(String bucketUrl) { - try { - bucketUrl=bucketUrl.replace(oss_domain+"web",""); - // 删除Object. - obsClient.deleteObject(bucketName, bucketUrl); - } catch (Exception e) { - e.printStackTrace(); - return false; - } finally { - //ossClient.shutdown(); - } - return true; - } - -// public static void createBucket(String bucketName) -// { -// //初始化 OSSClient -//// ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret); -// -// // 新建一个Bucket -// Bucket bucket = ossClient.createBucket(bucketName); -// System.out.println(bucket.getName()); -// System.out.println(bucket.getCreationDate()); -// } -// -// public static void main(String[] args) { -// OssUploadUtil.createBucket("ssfdfsd"); -// } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/PayMoneyUtil.java b/optometry/src/main/java/com/jilongda/optometry/utils/PayMoneyUtil.java deleted file mode 100644 index ae8d7cd..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/PayMoneyUtil.java +++ /dev/null @@ -1,1062 +0,0 @@ -package com.jilongda.optometry.utils;//package com.hollywood.applet.utils; -// -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONObject; -// -//import com.alipay.api.AlipayApiException; -//import com.alipay.api.AlipayClient; -//import com.alipay.api.DefaultAlipayClient; -//import com.alipay.api.domain.*; -//import com.alipay.api.request.AlipayTradeAppPayRequest; -//import com.alipay.api.response.AlipayTradeAppPayResponse; -//import com.hollywood.common.basic.ApiResult; -//import org.bouncycastle.jce.provider.BouncyCastleProvider; -//import org.dom4j.Document; -//import org.dom4j.DocumentException; -//import org.dom4j.Element; -//import org.dom4j.io.SAXReader; -//import org.springframework.http.HttpHeaders; -//import org.springframework.http.MediaType; -//import org.springframework.stereotype.Component; -// -//import javax.crypto.BadPaddingException; -//import javax.crypto.Cipher; -//import javax.crypto.IllegalBlockSizeException; -//import javax.crypto.NoSuchPaddingException; -//import javax.crypto.spec.SecretKeySpec; -//import javax.servlet.http.HttpServletRequest; -//import java.io.*; -//import java.math.BigDecimal; -//import java.net.InetAddress; -//import java.net.UnknownHostException; -//import java.security.InvalidKeyException; -//import java.security.NoSuchAlgorithmException; -//import java.security.NoSuchProviderException; -//import java.security.Security; -//import java.util.*; -// -///** -// * 第三方支付工具类 -// */ -//@Component -//public class PayMoneyUtil { -// private String aliAppid = "2021004105665036";//支付宝appid -// -// private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥 -// -// private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥 -// -// private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥 -// -// private String appid = "";//微信appid -// -// private String appletsAppid = "";//微信小程序appid -// -// private String mchId = "";//微信商户号 -// -// private String key = "";//微信商户号 -// -// private String callbackPath = "http://8.137.22.229:56666/competition";//支付回调网关地址 -// -// private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径 -// -// private String alipay_cert_path = "C:/cert/alipay/user/alipay_cert_path.crt";//支付宝公钥证书文件路径 -// -// private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径 -// -// private String certPath = "C:\\cert\\1523106371_20211206_cert\\apiclient_cert.p12";//微信证书 -// -// -// /** -// * 支付宝支付 -// */ -// public ApiResult alipay(String smid,String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl) { -// -// -// //实例化客户端 -// AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2"); -// //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称:alipay.trade.app.pay -// AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest(); -// //SDK已经封装掉了公共参数,这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。 -// AlipayTradeAppPayModel model = new AlipayTradeAppPayModel(); -// model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品,请将商品描述字符串累加传给body。 -// model.setSubject("报名赛事");//商品的标题/交易标题/订单标题/订单关键字等。 -// model.setOutTradeNo(outTradeNo);//商户网站唯一订单号 -// model.setTimeoutExpress("30m"); -// model.setTotalAmount(amount);//付款金额 -// model.setProductCode("QUICK_MSECURITY_PAY"); -// model.setPassbackParams(passbackParams);//自定义参数 -// SettleInfo settleInfo = new SettleInfo(); -// settleInfo.setSettlePeriodTime("3d"); -// SettleDetailInfo settleDetailInfo = new SettleDetailInfo(); -// settleDetailInfo.setTransInType("defaultSettle"); -// settleDetailInfo.setAmount(amount); -// List<SettleDetailInfo> settleDetailInfos = new ArrayList<>(); -// settleDetailInfos.add(settleDetailInfo); -// settleInfo.setSettleDetailInfos(settleDetailInfos); -// model.setSettleInfo(settleInfo); -// SubMerchant subMerchant = new SubMerchant(); -// subMerchant.setMerchantId(smid); -// model.setSubMerchant(subMerchant); -// ExtendParams extendParams = new ExtendParams(); -// extendParams.setRoyaltyFreeze("true");// 冻结资金 用于后续分账处理 -// model.setExtendParams(extendParams); -// request.setBizModel(model); -// request.setNotifyUrl(callbackPath + notifyUrl); -// -// try { -// //这里和普通的接口调用不同,使用的是sdkExecute -// AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request); -// Map<String, String> map = new HashMap<>(); -// map.put("orderString", response.getBody()); -// System.out.println(map);//就是orderString 可以直接给客户端请求,无需再做处理。 -// return ApiResult.success(map); -// } catch (AlipayApiException e) { -// e.printStackTrace(); -// } -// return null; -// } -// -// -// -// -// -// /** -// * 支付成功后的回调处理逻辑 -// * -// * @param request -// */ -// public Map<String, String> alipayCallback(HttpServletRequest request) { -// //获取支付宝POST过来反馈信息 -// Map<String, String> params = new HashMap<String, String>(); -// Map requestParams = request.getParameterMap(); -// for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) { -// String name = (String) iter.next(); -// String[] values = (String[]) requestParams.get(name); -// String valueStr = ""; -// for (int i = 0; i < values.length; i++) { -// valueStr = (i == values.length - 1) ? valueStr + values[i] -// : valueStr + values[i] + "_"; -// } -// //乱码解决,这段代码在出现乱码时使用。 -// //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8"); -// params.put(name, valueStr); -// } -// -// -// -// Map<String, String> map = new HashMap<>(); -// String out_trade_no = params.get("out_trade_no"); -// String subject = params.get("subject"); -// String total_amount = params.get("total_amount"); -// String trade_no = params.get("trade_no"); -// String passback_params = params.get("passback_params"); -// map.put("out_trade_no", out_trade_no);//商家订单号 -// map.put("subject", subject); -// map.put("total_amount", total_amount); -// map.put("trade_no", trade_no);//支付宝交易号 -// map.put("passback_params", passback_params);//回传参数 -// return map; -// } -// -// -// -// -// -// -// /** -// * 微信统一下单 -// * -// * @param body 商品描述 -// * @param attach 附加数据 -// * @param out_trade_no 商户订单号 -// * @param total_fee 标价金额 -// * @param notify_url 通知地址 -// * @param tradeType 交易类型 -// * @return -// */ -// public ApiResult weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType, String openId) throws Exception { -// int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue(); -// String hostAddress = null; -// try { -// hostAddress = InetAddress.getLocalHost().getHostAddress(); -// } catch (UnknownHostException e) { -// e.printStackTrace(); -// } -// String nonce_str = UUIDUtil.getRandomCode(16); -// Map<String, Object> map = new HashMap<>(); -// map.put("appid", "APP".equals(tradeType) ? appid : appletsAppid); -// map.put("mch_id", mchId); -// map.put("nonce_str", nonce_str); -// map.put("body", body); -// map.put("attach", attach);//存储订单id -// map.put("out_trade_no", out_trade_no);//存储的订单code -// map.put("total_fee", i); -// map.put("spbill_create_ip", hostAddress); -// map.put("notify_url", callbackPath + notify_url); -// map.put("trade_type", tradeType); -// if ("JSAPI".equals(tradeType)) { -// map.put("openid", openId); -// } -// String s = this.weixinSignature(map); -// map.put("sign", s); -// -// String url = "https://api.mch.weixin.qq.com/pay/unifiedorder"; -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData(); -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// if ("SUCCESS".equals(return_code)){ -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)){ -// String type = map1.get("trade_type"); -// String prepay_id = map1.get("prepay_id"); -// switch (type) { -// case "JSAPI": -// //重新进行签名后返回给前端 -// Map<String, Object> map2 = new HashMap<>(); -// map2.put("appId", map1.get("appid")); -// map2.put("nonceStr", map1.get("nonce_str")); -// map2.put("package", "prepay_id=" + prepay_id); -// map2.put("signType", "MD5"); -// map2.put("timeStamp", new Date().getTime() + ""); -// String s2 = this.weixinSignature(map2); -// -// map2.put("prepay_id", prepay_id); -// map2.put("mch_id", map1.get("mch_id")); -// map2.put("trade_type", map1.get("trade_type")); -// -// map2.put("sign", s2); -// return ResultUtil.success(map2); -// case "NATIVE": -// String code_url = map1.get("code_url"); -// return ResultUtil.success(code_url); -// case "APP": -// //重新进行签名后返回给前端 -// Map<String, Object> map3 = new HashMap<>(); -// map3.put("appid", appid); -// map3.put("noncestr", nonce_str); -// map3.put("package", "Sign=WXPay"); -// map3.put("partnerid", mchId); -// map3.put("prepayid", prepay_id); -// map3.put("timestamp", new Date().getTime() / 1000); -// String s1 = this.weixinSignature(map3); -// map3.put("sign", s1); -// System.err.println(map3); -// return ResultUtil.success(map3); -// } -// return null; -// } else { -// System.err.println(map1.get("err_code_des")); -// return ResultUtil.error(map1.get("err_code_des")); -// } -// } else { -// System.err.println(map1.get("return_msg") + appid + "----" + mchId); -// return ResultUtil.error(map1.get("return_msg"), new JSONObject()); -// } -// } -// -// -// /** -// * 微信支付成功后的回调处理 -// * -// * @param request -// */ -// public Map<String, String> weixinpayCallback(HttpServletRequest request) { -// try { -// String param = this.getParam(request); -// param = param.replaceAll("<!\\[CDATA\\[", ""); -// param = param.replaceAll("]]>", ""); -// Map<String, String> map = this.xmlToMap(param, "UTF-8"); -// String return_code = map.get("return_code"); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// Map<String, String> map1 = new HashedMap(); -// map1.put("nonce_str", map.get("nonce_str")); -// map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code -// map1.put("attach", map.get("attach"));//存储订单id -// map1.put("total_fee", map.get("total_fee")); -// map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号 -// String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>"; -// map1.put("result", result); -// return map1; -// } else { -// System.err.println(map.get("err_code_des")); -// } -// } else { -// System.err.println(map.get("return_msg")); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// return null; -// } -// -// -// /** -// * 微信扫码收款 -// * -// * @param body 商品描述 -// * @param attach 附加数据 -// * @param nonce_str 随机字符串 -// * @param out_trade_no 商户订单号 -// * @param total_fee 订单金额 -// * @param auth_code 授权码 扫码支付授权码,设备读取用户微信中的条码或者二维码信息(注:用户付款码条形码规则:18位纯数字,以10、11、12、13、14、15开头) -// * @return -// */ -// public ResultUtil wxScanQRCodePay(String body, String attach, String nonce_str, String out_trade_no, String total_fee, String auth_code) { -// int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue(); -// String hostAddress = null; -// try { -// InetAddress address = InetAddress.getLocalHost(); -// hostAddress = address.getHostAddress(); -// } catch (UnknownHostException e) { -// e.printStackTrace(); -// } -// String randomCode = null; -// try { -// randomCode = UUIDUtil.getRandomCode(10); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// Map<String, Object> map = new HashMap<>(); -// map.put("appid", appid); -// map.put("mch_id", mchId); -// map.put("nonce_str", nonce_str);//存储的支付人员id,员工扫描二维码支付的时候存储的是收款员工id -// map.put("body", body); -// map.put("attach", attach);//存储的费用月份数据,员工扫描二维码支付的时候存储的是收费项id -// map.put("out_trade_no", randomCode + "_" + out_trade_no);//存储的房间id -// map.put("total_fee", i); -// map.put("spbill_create_ip", hostAddress); -// map.put("auth_code", auth_code); -// String s = this.weixinSignature(map); -// map.put("sign", s); -// -// String url = "https://api.mch.weixin.qq.com/pay/unifiedorder"; -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = null; -// try { -// body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData(); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// String type = map1.get("trade_type"); -// switch (type) { -// case "JSAPI": -// break; -// case "NATIVE": -// String code_url = map1.get("code_url"); -// return ResultUtil.success(code_url); -// case "APP": -// String prepay_id = map1.get("prepay_id"); -// //重新进行签名后返回给前端 -// Map<String, Object> map2 = new HashMap<>(); -// map2.put("appid", appid); -// map2.put("noncestr", nonce_str); -// map2.put("package", "Sign=WXPay"); -// map2.put("partnerid", mchId); -// map2.put("prepayid", prepay_id); -// map2.put("timestamp", new Date().getTime() + ""); -// String s1 = this.weixinSignature(map2); -// -// map2.put("pac", "Sign=WXPay"); -// map2.put("sign", s1); -//// System.err.println(map2); -// return ResultUtil.success(map2); -// } -// return null; -// } else { -//// System.err.println(map1.get("err_code_des")); -// return ResultUtil.error(map1.get("err_code_des")); -// } -// } else { -//// System.err.println(map1.get("return_msg") + appid + "----" + mchId); -// return ResultUtil.error(map1.get("return_msg"), new JSONObject()); -// } -// } -// -// -// /** -// * 支付宝扫码收款 -// * -// * @param data -// * @return -// */ -// public Object aliScanQRCodePay(String data) { -// return null; -// } -// -// -// /** -// * 微信退款申请 -// * -// * @param transaction_id 微信订单号。微信生成的订单号,在支付通知中有返回 -// * @param out_refund_no 商户退款单号。商户系统内部的退款单号,商户系统内部唯一,只能是数字、大小写字母_-|*@ ,同一退款单号多次请求只退一笔。 -// * @param total_fee 订单金额。订单总金额,单位为分,只能为整数 -// * @param refund_fee 退款金额。退款总金额,订单总金额,单位为分,只能为整数 -// * @param notify_url 退款结果通知url。异步接收微信支付退款结果通知的回调地址,通知URL必须为外网可访问的url,不允许带参数 如果参数中传了notify_url,则商户平台上配置的回调地址将不会生效。 -// * @return -// */ -// public Map<String, String> wxRefund(String transaction_id, String out_refund_no, String total_fee, String refund_fee, String notify_url) { -// int tf = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue(); -// int rf = new BigDecimal(refund_fee).multiply(new BigDecimal("100")).intValue(); -// String nonce_str = UUIDUtil.getRandomCode(); -// Map<String, Object> map = new HashMap<>(); -// map.put("appid", appid); -// map.put("mch_id", mchId); -// map.put("nonce_str", nonce_str); -// map.put("transaction_id", transaction_id); -// map.put("out_refund_no", out_refund_no); -// map.put("total_fee", tf); -// map.put("refund_fee", rf); -// map.put("notify_url", callbackPath + notify_url); -// String s = this.weixinSignature(map, key); -// map.put("sign", s); -// -// String url = "https://api.mch.weixin.qq.com/secapi/pay/refund"; -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = null; -// try { -// body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12"); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// System.err.println(body1); -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// Map<String, String> map2 = new HashMap<>(); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// map2.put("return_code", result_code); -// map2.put("refund_id", String.valueOf(map1.get("refund_id")));//微信退款订单号 -// map2.put("refund_fee", String.valueOf(map1.get("refund_fee")));//退款金额 -// return map2; -// } else { -// map2.put("return_code", result_code); -// map2.put("return_msg", map1.get("err_code_des")); -// return map2; -// } -// } else { -// map2.put("return_code", return_code); -// map2.put("return_msg", map1.get("return_msg")); -// return map2; -// } -// } -// -// -// /** -// * 微信退款成功后的回调处理 -// * -// * @param request -// * @return -// */ -// public Map<String, String> wxRefundCallback(HttpServletRequest request) { -// try { -// String param = this.getParam(request); -// param = param.replaceAll("<!\\[CDATA\\[", ""); -// param = param.replaceAll("]]>", ""); -// Map<String, String> map = this.xmlToMap(param, "UTF-8"); -// String return_code = map.get("return_code"); -// if ("SUCCESS".equals(return_code)) { -// String req_info = map.get("req_info");//加密信息请用商户秘钥进行解密 -// String s = this.wxDecrypt(req_info); -// s = s.replaceAll("<!\\[CDATA\\[", ""); -// s = s.replaceAll("]]>", ""); -// map = this.xmlToMap(s, "UTF-8"); -// Map<String, String> map1 = new HashMap<>(); -// map1.put("refund_id", map.get("refund_id")); -// map1.put("out_refund_no", map.get("out_refund_no")); -// String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>"; -// map1.put("result", result); -// return map1; -// } else { -//// System.err.println(map.get("return_msg")); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } catch (NoSuchAlgorithmException e) { -// e.printStackTrace(); -// } catch (InvalidKeyException e) { -// e.printStackTrace(); -// } catch (NoSuchPaddingException e) { -// e.printStackTrace(); -// } catch (BadPaddingException e) { -// e.printStackTrace(); -// } catch (NoSuchProviderException e) { -// e.printStackTrace(); -// } catch (IllegalBlockSizeException e) { -// e.printStackTrace(); -// } -// return null; -// } -// -// -// /** -// * 支付宝退款 -// * -// * @param trade_no 支付宝交易号 -// * @param refund_amount 退款金额 -// * @return -// * @throws AlipayApiException -// */ -// public Map<String, String> aliRefund(String trade_no, String refund_amount) throws AlipayApiException { -// AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2"); -// AlipayTradeRefundRequest request = new AlipayTradeRefundRequest(); -// JSONObject jsonObject = new JSONObject(); -// jsonObject.put("trade_no", trade_no); -// jsonObject.put("refund_amount", refund_amount); -// request.setBizContent(jsonObject.toJSONString()); -// AlipayTradeRefundResponse response = alipayClient.execute(request); -// Map<String, String> map = new HashMap<>(); -// if (response.isSuccess()) { -// System.out.println("调用成功"); -// String outTradeNo = response.getOutTradeNo(); -// map.put("code", response.getCode());//10000 -// map.put("trade_no", response.getTradeNo());//支付宝交易号 -// map.put("out_trade_no", outTradeNo);//商户订单号 -// } else { -// System.out.println("调用失败"); -// map.put("code", response.getCode()); -// map.put("msg", response.getSubMsg()); -// } -// return map; -// } -// -// -// /** -// * 查询微信支付订单 -// * -// * @return -// * @throws Exception -// */ -// public ResultUtil<Map<String, String>> queryWXOrder(String out_trade_no, String transaction_id) throws Exception { -// String url = "https://api.mch.weixin.qq.com/pay/orderquery"; -// String nonce_str = UUIDUtil.getRandomCode(16); -// Map<String, Object> map = new HashMap<>(); -// map.put("appid", appid); -// map.put("mch_id", mchId); -// map.put("out_trade_no", out_trade_no);//商户订单号 -// map.put("transaction_id", transaction_id);//微信订单号 -// map.put("nonce_str", nonce_str);//随机字符串 -// String s = this.weixinSignature(map); -// map.put("sign", s); -// -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData(); -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// Map<String, String> map2 = new HashMap<>(); -// map2.put("trade_type", map1.get("trade_type")); -// map2.put("trade_state", map1.get("trade_state"));//订单状态SUCCESS—支付成功,REFUND—转入退款,NOTPAY—未支付,CLOSED—已关闭,REVOKED—已撤销(刷卡支付),USERPAYING--用户支付中,PAYERROR--支付失败(其他原因,如银行返回失败) -// map2.put("transaction_id", map1.get("transaction_id")); -// return ResultUtil.success(map2); -// } else { -// System.err.println(map1.get("err_code_des")); -// return ResultUtil.error(map1.get("err_code_des")); -// } -// } else { -// System.err.println(map1.get("return_msg") + appid + "----" + mchId); -// return ResultUtil.error(map1.get("return_msg")); -// } -// } -// -// -// /** -// * 微信转账功能(企业付款到零钱) -// * -// * @param openid 商户appid下,某用户的openid -// * @param desc 企业付款备注,必填。 -// * @param total_fee 企业付款金额 -// * @param partner_trade_no 商户订单号,需保持唯一性 -// * @return -// */ -// public Map<String, String> wxTransfers(String openid, String desc, String total_fee, String partner_trade_no) throws Exception { -// int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue(); -// String nonce_str = UUIDUtil.getRandomCode(); -// Map<String, Object> map = new HashMap<>(); -// map.put("mch_appid", appid);//申请商户号的appid或商户号绑定的appid -// map.put("mchid", mchId);//微信支付分配的商户号 -// map.put("nonce_str", nonce_str);//随机字符串,不长于32位 -// map.put("partner_trade_no", partner_trade_no);//商户订单号,需保持唯一性 -// map.put("openid", openid);//商户appid下,某用户的openid -// map.put("check_name", "NO_CHECK");//NO_CHECK:不校验真实姓名 FORCE_CHECK:强校验真实姓名 -// map.put("amount", amount);//企业付款金额,单位为分 -// map.put("desc", desc);//企业付款备注,必填。 -// String s = this.weixinSignature(map, key); -// map.put("sign", s); -// -// String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"; -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12"); -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// Map<String, String> map2 = new HashMap<>(); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// map2.put("return_code", result_code); -// map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号 -// map2.put("payment_time", String.valueOf(map1.get("payment_time")));//付款时间 -// return map2; -// } else { -// map2.put("return_code", result_code); -// map2.put("err_code", map1.get("err_code")); -// map2.put("err_code_des", map1.get("err_code_des")); -// return map2; -// } -// } else { -// map2.put("return_code", return_code); -// map2.put("return_msg", map1.get("return_msg")); -// return map2; -// } -// } -// -// -// /** -// * 微信转账功能(企业付款到银行卡) -// * -// * @param desc 备注信息 -// * @param total_fee 转账金额 -// * @param partner_trade_no 订单号 -// * @param enc_bank_no 银行卡号 -// * @param enc_true_name 收款方用户名 -// * @param bankName 银行名称 -// * @return -// * @throws Exception -// */ -// public Map<String, String> wxPayBank(String desc, String total_fee, String partner_trade_no, String enc_bank_no, String enc_true_name, String bankName) throws Exception { -// int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue(); -// String nonce_str = UUIDUtil.getRandomCode(); -// Map<String, Object> map = new HashMap<>(); -// map.put("mch_id", mchId);//微信支付分配的商户号 -// map.put("nonce_str", nonce_str);//随机字符串,不长于32位 -// map.put("partner_trade_no", partner_trade_no);//商户订单号,需保持唯一性 -// map.put("enc_bank_no", enc_bank_no);//收款方银行卡号(采用标准RSA算法,公钥由微信侧提供) -// map.put("enc_true_name", enc_true_name);//收款方用户名(采用标准RSA算法,公钥由微信侧提供) -// map.put("bank_code", findBankCode(bankName));// -// map.put("amount", amount);//企业付款金额,单位为分 -// map.put("desc", desc);//企业付款备注,必填。 -// String s = this.weixinSignature(map, key); -// map.put("sign", s); -// -// String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; -// //设置请求头 -// HttpHeaders headers = new HttpHeaders(); -// headers.setContentType(MediaType.APPLICATION_XML); -// StringBuffer xmlString = new StringBuffer(); -// Set<String> strings = map.keySet(); -// String[] keys = {}; -// keys = strings.toArray(keys); -// Arrays.sort(keys); -// xmlString.append("<xml>"); -// for (int l = 0; l < keys.length; l++) { -// xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">"); -// } -// xmlString.append("</xml>"); -// -// Map<String, String> map1 = null; -// String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12"); -// //将结果xml解析成map -// body1 = body1.replaceAll("<!\\[CDATA\\[", ""); -// body1 = body1.replaceAll("]]>", ""); -// try { -// map1 = this.xmlToMap(body1, "UTF-8"); -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// String return_code = map1.get("return_code"); -// Map<String, String> map2 = new HashMap<>(); -// if ("SUCCESS".equals(return_code)) { -// String result_code = map1.get("result_code"); -// if ("SUCCESS".equals(result_code)) { -// map2.put("return_code", result_code); -// map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号 -// map2.put("cmms_amt", String.valueOf(map1.get("cmms_amt")));//手续费金额 RMB:分 -// return map2; -// } else { -// map2.put("return_code", result_code); -// map2.put("err_code", map1.get("err_code")); -// map2.put("err_code_des", map1.get("err_code_des")); -// return map2; -// } -// } else { -// map2.put("return_code", return_code); -// map2.put("return_msg", map1.get("return_msg")); -// return map2; -// } -// } -// -// /** -// * 微信转账到银行卡不编号 -// * -// * @param bankName -// * @return -// */ -// public String findBankCode(String bankName) { -// String json = "{\"工商银行 \":1002,\"农业银行\":1005,\"建设银行\":1003,\"中国银行\":1026,\"交通银行 \":1020,\"招商银行 \":1001,\"邮储银行\":1066,\"民生银行 \":1006,\"平安银行 \":1010,\"中信银行\":1021,\"浦发银行 \":1004,\"兴业银行 \":1009,\"光大银行 \":1022,\"广发银行\":1027,\"华夏银行\":1025,\"宁波银行\":1056,\"北京银行\":4836,\"上海银行\":1024,\"南京银行\":1054,\"长子县融汇村镇银行\":4755,\"长沙银行\":4216,\"浙江泰隆商业银行\":4051,\"中原银行 \":4753,\"企业银行(中国)\":4761,\"顺德农商银行 \":4036,\"衡水银行\":4752,\"长治银行\":4756,\"大同银行\":4767,\"河南省农村信用社\":4115,\"宁夏黄河农村商业银行\":4150,\"山西省农村信用社\":4156,\"安徽省农村信用社\":4166,\"甘肃省农村信用社\":4157,\"天津农村商业银行\":4153,\"广西壮族自治区农村信用社\":4113,\"陕西省农村信用社\":4108,\"深圳农村商业银行\":4076,\"宁波鄞州农村商业银行\":4052,\"浙江省农村信用社联合社\":4764,\"江苏省农村信用社联合社\":4217,\"江苏紫金农村商业银行股份有限公司 \":4072,\"北京中关村银行股份有限公司 \":4769,\"星展银行( 中国) 有限公司 \":4778,\"枣庄银行股份有限公司 \":4766,\"海口联合农村商业银行股份有限公司 \":4758,\"南洋商业银行( 中国) 有限公司 \":4763}"; -// JSONObject jsonObject = JSON.parseObject(json); -// Set<String> strings = jsonObject.keySet(); -// for (String key : strings) { -// if (key.indexOf(bankName) >= 0) { -// return jsonObject.getString(key); -// } -// } -// return ""; -// } -// -// -// /** -// * 支付宝转账 -// * -// * @param out_biz_no 商家侧唯一订单号,由商家自定义。对于不同转账请求,商家需保证该订单号在自身系统唯一。 -// * @param trans_amount 订单总金额,单位为元,精确到小数点后两位 -// * @param order_title 转账业务的标题,用于在支付宝用户的账单里显示 -// * @param identity 参与方的唯一标识(收款方支付宝账号) -// * @param name 参与方真实姓名,如果非空,将校验收款支付宝账号姓名一致性。 -// * @param remark 业务备注 -// * @return -// * @throws Exception -// */ -// public Map<String, Object> aliTransfer(String out_biz_no, Double trans_amount, String order_title, String identity, String name, String remark) throws Exception { -// CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); -// certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do"); //gateway:支付宝网关(固定)https://openapi.alipay.com/gateway.do -// certAlipayRequest.setAppId(aliAppid); //APPID 即创建应用后生成,详情见创建应用并获取 APPID -// certAlipayRequest.setPrivateKey(appPrivateKey); //开发者应用私钥,由开发者自己生成 -// certAlipayRequest.setFormat("json"); //参数返回格式,只支持 json 格式 -// certAlipayRequest.setCharset("UTF-8"); //请求和签名使用的字符编码格式,支持 GBK和 UTF-8 -// certAlipayRequest.setSignType("RSA2"); //商户生成签名字符串所使用的签名算法类型,目前支持 RSA2 和 RSA,推荐商家使用 RSA2。 -// certAlipayRequest.setCertPath(app_cert_path); //应用公钥证书路径(app_cert_path 文件绝对路径) -// certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path); //支付宝公钥证书文件路径(alipay_cert_path 文件绝对路径) -// certAlipayRequest.setRootCertPath(alipay_root_cert_path); //支付宝CA根证书文件路径(alipay_root_cert_path 文件绝对路径) -// AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); -// AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest(); -// request.setBizContent("{" + -// "\"out_biz_no\":\"" + out_biz_no + "\"," + -// "\"trans_amount\":" + trans_amount + "," + -// "\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," + -// "\"biz_scene\":\"DIRECT_TRANSFER\"," + -// "\"order_title\":\"" + order_title + "\"," + -// "\"payee_info\":{" + -// "\"identity\":\"" + identity + "\"," + -// "\"identity_type\":\"ALIPAY_USER_ID\"," + -// "\"name\":\"" + name + "\"," + -// "}," + -// "\"remark\":\"" + remark + "\"" + -// "}"); -// AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request); -// Map<String, Object> map = new HashMap<>(); -// if (response.isSuccess()) { -// String status = response.getStatus(); -// if (status.equals("SUCCESS")) {//成功 -// map.put("code", response.getCode()); -// map.put("order_id", response.getOrderId());//支付宝订单号 -// map.put("pay_fund_order_id", response.getPayFundOrderId());//支付宝流水号 -// } else { -// map.put("code", response.getCode()); -// map.put("sub_msg", response.getSubMsg()); -// } -// } else { -// map.put("code", response.getSubCode()); -// map.put("sub_msg", response.getSubMsg()); -// } -// return map; -// } -// -// -// /** -// * 获取请求内容 -// * -// * @param request -// * @return -// * @throws IOException -// */ -// private String getParam(HttpServletRequest request) throws IOException { -// // 读取参数 -// InputStream inputStream; -// StringBuilder sb = new StringBuilder(); -// inputStream = request.getInputStream(); -// String s; -// BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); -// while ((s = in.readLine()) != null) { -// sb.append(s); -// } -// in.close(); -// inputStream.close(); -// return sb.toString(); -// } -// -// -// /** -// * 微信下单的签名算法 -// * -// * @param map -// * @return -// */ -// private String weixinSignature(Map<String, Object> map) { -// try { -// Set<Map.Entry<String, Object>> entries = map.entrySet(); -// List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries); -// // 对所有传入参数按照字段名的 ASCII 码从小到大排序(字典序) -// Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() { -// public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) { -// return (o1.getKey()).toString().compareTo(o2.getKey()); -// } -// }); -// // 构造签名键值对的格式 -// StringBuilder sb = new StringBuilder(); -// for (Map.Entry<String, Object> item : infoIds) { -// if (item.getKey() != null || item.getKey() != "") { -// String key = item.getKey(); -// Object val = item.getValue(); -// if (!(val == "" || val == null)) { -// sb.append(key + "=" + val + "&"); -// } -// } -// } -// sb.append("key=" + key); -// String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注:MD5签名方式 -// return sign; -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return null; -// } -// -// -// /** -// * 微信下单的签名算法 -// * -// * @param map -// * @return -// */ -// private String weixinSignature(Map<String, Object> map, String key_) { -// try { -// Set<Map.Entry<String, Object>> entries = map.entrySet(); -// List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries); -// // 对所有传入参数按照字段名的 ASCII 码从小到大排序(字典序) -// Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() { -// public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) { -// return (o1.getKey()).toString().compareTo(o2.getKey()); -// } -// }); -// // 构造签名键值对的格式 -// StringBuilder sb = new StringBuilder(); -// for (Map.Entry<String, Object> item : infoIds) { -// if (item.getKey() != null || item.getKey() != "") { -// String key = item.getKey(); -// Object val = item.getValue(); -// if (!(val == "" || val == null)) { -// sb.append(key + "=" + val + "&"); -// } -// } -// } -// sb.append("key=" + key_); -// String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注:MD5签名方式 -// return sign; -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return null; -// } -// -// -// /** -// * 微信退款成功后的解密 -// * -// * @param req_info -// * @return -// */ -// private String wxDecrypt(String req_info) throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException, -// InvalidKeyException, BadPaddingException, IllegalBlockSizeException { -// byte[] decode = Base64.getDecoder().decode(req_info); -// String sign = MD5AndKL.MD5Encode(key, "UTF-8").toLowerCase(); -// if (Security.getProvider("BC") == null) { -// Security.addProvider(new BouncyCastleProvider()); -// } -// Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding", "BC"); -// SecretKeySpec secretKeySpec = new SecretKeySpec(sign.getBytes(), "AES"); -// cipher.init(Cipher.DECRYPT_MODE, secretKeySpec); -// return new String(cipher.doFinal(decode)); -// } -// -// -//// public static void main(String[] ages){ -//// PayMoneyUtil payMoneyUtil = new PayMoneyUtil(); -//// ResultUtil ce = payMoneyUtil.alipay("测试", "测试", "", "121456457", "10", "http://123.com"); -//// System.err.println(ce); -//// ResultUtil resultUtil = null; -//// try { -//// resultUtil = payMoneyUtil.queryALIOrder("121456457"); -//// } catch (Exception e) { -//// e.printStackTrace(); -//// } -//// System.err.println(resultUtil); -//// } -// -// -// /** -// * xml转map -// * -// * @param xml -// * @param charset -// * @return -// * @throws UnsupportedEncodingException -// * @throws DocumentException -// */ -// public static Map<String, String> xmlToMap(String xml, String charset) throws UnsupportedEncodingException, DocumentException { -// -// Map<String, String> respMap = new HashMap<String, String>(); -// -// SAXReader reader = new SAXReader(); -// Document doc = reader.read(new ByteArrayInputStream(xml.getBytes(charset))); -// Element root = doc.getRootElement(); -// xmlToMap(root, respMap); -// return respMap; -// } -// -// public static Map<String, String> xmlToMap(Element tmpElement, Map<String, String> respMap) { -// if (tmpElement.isTextOnly()) { -// respMap.put(tmpElement.getName(), tmpElement.getText()); -// return respMap; -// } -// -// @SuppressWarnings("unchecked") -// Iterator<Element> eItor = tmpElement.elementIterator(); -// while (eItor.hasNext()) { -// Element element = eItor.next(); -// xmlToMap(element, respMap); -// } -// return respMap; -// } -//} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/UUIDUtil.java b/optometry/src/main/java/com/jilongda/optometry/utils/UUIDUtil.java deleted file mode 100644 index 0f741de..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/UUIDUtil.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.jilongda.optometry.utils; - - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.UUID; - -/** - * 定义生成随机码的工具类 - */ -public class UUIDUtil { - - private int i = 1; - - - /** - * 定义生成原生的UUID随机码 - * - * @return - */ - public static String getNativeUUID() { - return UUID.randomUUID().toString(); - } - - - /** - * 生成32位随机码 - * - * @return - */ - public static String getRandomCode() { - return UUIDUtil.getNativeUUID().replaceAll("-", ""); - } - - - /** - * 获取给定长度的随机码 - * - * @param num - * @return - * @throws Exception - */ - public static String getRandomCode(Integer num) throws Exception { - String str = null; - if (0 < num) { - if (num % 32 > 0) { - Integer s = num / 32; - Integer l = num % 32; - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < s; i++) { - sb.append(UUIDUtil.getRandomCode()); - } - sb.append(UUIDUtil.getRandomCode().substring(0, l)); - str = sb.toString(); - } else if (num % 32 == 0) { - Integer s = num / 32; - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < s; i++) { - sb.append(UUIDUtil.getRandomCode()); - } - str = sb.toString(); - } else { - str = UUIDUtil.getRandomCode().substring(0, num); - } - } else { - throw new Exception("参数只能大于0"); - } - return str; - } - - - /** - * 获取根据当前时间的字符串数据 - * - * @return - */ - public synchronized static String getTimeStr() { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmssS"); - return simpleDateFormat.format(new Date()); - } - - - /** - * @Description: 获取数字随机码 - * @Author pzb - * @Date 2021/8/11 16:52 - * @Param - * @Return - * @Exception - */ - public static String getNumberRandom(Integer num) { - if (null == num) { - num = 32; - } - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < num; i++) { - sb.append(Double.valueOf(Math.random() * 10).intValue()); - } - return sb.toString(); - } - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/dingding/AccessTokenUtil.java b/optometry/src/main/java/com/jilongda/optometry/utils/dingding/AccessTokenUtil.java deleted file mode 100644 index 959db6c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/dingding/AccessTokenUtil.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jilongda.optometry.utils.dingding;//// This file is auto-generated, don't edit it. Thanks. -//package com.jilongda.applet.utils.dingding; -// -//import com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenResponse; -//import com.aliyun.tea.*; -// -//public class AccessTokenUtil { -// -// /** -// * 使用 Token 初始化账号Client -// * @return Client -// * @throws Exception -// */ -// public static com.aliyun.dingtalkoauth2_1_0.Client createClient() throws Exception { -// com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config(); -// config.protocol = "https"; -// config.regionId = "central"; -// return new com.aliyun.dingtalkoauth2_1_0.Client(config); -// } -// -// public static void gettoken() throws Exception { -//// java.util.List<String> args = java.util.Arrays.asList(args_); -// com.aliyun.dingtalkoauth2_1_0.Client client = AccessTokenUtil.createClient(); -// com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest getAccessTokenRequest = new com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest() -// .setAppKey("ding9xnitayotphtuaxa") -// .setAppSecret("8I88pUQgJyteYsGscECS-RAIkc-vh2HlJwDzX5dhIFkI4Avpo5D_dmXBQM9flVzC"); -// try { -// client.getAccessToken(getAccessTokenRequest); -// -// return; -// } catch (TeaException err) { -// if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) { -// // err 中含有 code 和 message 属性,可帮助开发定位问题 -// } -// -// } catch (Exception _err) { -// TeaException err = new TeaException(_err.getMessage(), _err); -// if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) { -// // err 中含有 code 和 message 属性,可帮助开发定位问题 -// } -// -// } -// } -//} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/utils/dingding/DingTalkAccessTokenRequest.java b/optometry/src/main/java/com/jilongda/optometry/utils/dingding/DingTalkAccessTokenRequest.java deleted file mode 100644 index 18c05a5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/utils/dingding/DingTalkAccessTokenRequest.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jilongda.optometry.utils.dingding; - -import com.alibaba.fastjson.JSONObject; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.StandardCharsets; - -public class DingTalkAccessTokenRequest { - - public static String getAccessTokenRequest() throws Exception { - // 定义URL - URL url = new URL("https://api.dingtalk.com/v1.0/oauth2/accessToken"); - - // 打开连接 - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("POST"); - connection.setRequestProperty("Host", "api.dingtalk.com"); - connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); - connection.setDoOutput(true); // 设置允许输出 - - // 准备请求体 - String requestBody = "{\"appKey\":\"ding9xnitayotphtuaxa\",\"appSecret\":\"8I88pUQgJyteYsGscECS-RAIkc-vh2HlJwDzX5dhIFkI4Avpo5D_dmXBQM9flVzC\"}"; - - // 发送请求 - try (OutputStream outputStream = connection.getOutputStream()) { - outputStream.write(requestBody.getBytes(StandardCharsets.UTF_8)); - } - - // 获取响应码,假设我们需要检查是否成功 - int responseCode = connection.getResponseCode(); - connection.getResponseMessage(); - System.out.println("Response Code : " + responseCode); - if (responseCode == HttpURLConnection.HTTP_OK) { // 如果状态码为200 - try (BufferedReader in = new BufferedReader( - new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) { - String inputLine; - StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - - // 打印或处理响应数据 - System.out.println("Response Data: " + response.toString()); - JSONObject jsonObject = JSONObject.parseObject(response.toString()); - String o = (String) jsonObject.get("accessToken"); - return o; - - } - } else { - System.err.println("Failed with HTTP error code : " + responseCode); - } - - // 如果需要读取响应体,可以使用以下代码: - // BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); - // String inputLine; - // StringBuffer response = new StringBuffer(); - // while ((inputLine = in.readLine()) != null) { - // response.append(inputLine); - // } - // in.close(); - - // 这里我们没有处理响应体,实际应用中需要根据API的响应结构来解析JSON并处理结果 - return ""; - } - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderGoodsVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderGoodsVO.java deleted file mode 100644 index 535d2d6..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderGoodsVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName AppOrderGoodsVO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 15:01 - * @Version 1.0 - */ -@Data -public class AppOrderGoodsVO { - - @ApiModelProperty(value = "订单商品id") - private Long orderGoodsId; - @ApiModelProperty(value = "产品规格id") - private Long specId; - - @ApiModelProperty(value = "产品名称") - private String goodsName; - - @ApiModelProperty(value = "产品图片") - private String goodsPicture; - - @ApiModelProperty(value = "规格") - private String goodsSpecifications; - - @ApiModelProperty(value = "产品价格") - private String goodsPrice; - - @ApiModelProperty(value = "修改后价格") - private String updateGoodsPrice; - - @ApiModelProperty(value = "购买数量") - private Integer buyNum; - - @ApiModelProperty(value = "商品小计") - private String goodsTotal; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderPageVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderPageVO.java deleted file mode 100644 index 790312b..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderPageVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @ClassName AppOrderPageVO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 14:58 - * @Version 1.0 - */ -@Data -public class AppOrderPageVO { - - @ApiModelProperty("订单id") - private Long orderId; - - @ApiModelProperty("订单状态(1待审批,2已通过,3已拒绝,4待发货,5已发货,6.已撤回)") - private Integer orderStatus; - - @ApiModelProperty(value = "订单金额") - private BigDecimal orderAmount; - - @ApiModelProperty(value = "检测报告") - private String reportPics; - @ApiModelProperty(value = "审核人名称") - private String passName; - - - @ApiModelProperty(value = "订单时间") - private Date createTime; - - @ApiModelProperty(value = "订单商品列表") - private List<AppOrderGoodsVO> goodsList; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderVO.java deleted file mode 100644 index 487fda3..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/AppOrderVO.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -/** - * @ClassName AppOrderVO - * @Description TODO - * @Author jqs - * @Date 2024/4/17 16:27 - * @Version 1.0 - */ -@Data -public class AppOrderVO { - - @ApiModelProperty(value = "订单id") - private Long orderId; - - @ApiModelProperty(value = "订单状态(1待审批,2已通过,3已拒绝,4待发货,5已发货,6.已撤回)") - private Integer orderStatus; - - @ApiModelProperty(value = "客户收货地址id") - private Long customerId; - - @ApiModelProperty(value = "公司名") - private String companyName; - - @ApiModelProperty(value = "子公司名") - private String subsidiaryName; - - @ApiModelProperty(value = "收件人姓名") - private String recipientName; - - @ApiModelProperty(value = "收件人电话") - private String recipientPhone; - - @ApiModelProperty(value = "收件地址") - private String recipientAddress; - - @ApiModelProperty(value = "订单金额") - private String orderAmount; - - @ApiModelProperty(value = "款期") - private LocalDateTime paymentTerms; - - @ApiModelProperty(value = "发票类型1专票、2普票、3不开票") - private Integer invoiceType; - - @ApiModelProperty(value = "物流1自提,2配送") - private Integer logistics; - - @ApiModelProperty(value = "要求到货时间") - private LocalDate expectedDeliveryDate; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "下单人员") - private String orderingPerson; - - @ApiModelProperty(value = "审批人") - private String passUser; - - @ApiModelProperty(value = "审批备注") - private String passRemark; - - @ApiModelProperty(value = "检测报告") - private String reportPics; - - private String passName; - - @ApiModelProperty(value = "订单商品列表") - private List<AppOrderGoodsVO> goodsList; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/AppUserVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/AppUserVO.java deleted file mode 100644 index f999414..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/AppUserVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * @ClassName AppUserVO - * @Description TODO - * @Author jqs - * @Date 2024/4/18 9:50 - * @Version 1.0 - */ -@Data -public class AppUserVO { - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "用户昵称") - private String nickName; - - @ApiModelProperty(value = "微信头像地址") - private String avatarUrl; - - @ApiModelProperty(value = "省") - private String province; - - @ApiModelProperty(value = "市") - private String city; - - @ApiModelProperty(value = "区") - private String area; - - @ApiModelProperty(value = "详细地址") - private String address; - - @ApiModelProperty(value = "生日") - private LocalDateTime birthday; - - @ApiModelProperty(value = "1男2女0未知") - private Integer gender; - - @ApiModelProperty(value = "职位1总经理2销售总监3业务经理") - private Integer userType; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/GoodDetailVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/GoodDetailVO.java deleted file mode 100644 index 907a7bf..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/GoodDetailVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - -@Data -@ApiModel("产品详情VO") -public class GoodDetailVO extends TGoods { - @ApiModelProperty(value = "产品价格") - private List<BigDecimal> price; - @ApiModelProperty(value = "是否为常用商品1是0否") - private Integer isUsual; - @ApiModelProperty(value = "产品规格") - private String specifications; - @ApiModelProperty(value = "总经理价格") - private List<BigDecimal> generalManagerPrice; - @ApiModelProperty(value = "销售总监价格") - private List<BigDecimal> salesDirector; - @ApiModelProperty(value = "客户经理价格") - private List<BigDecimal> accountManager; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/IndexGoodVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/IndexGoodVO.java deleted file mode 100644 index 9f8a66c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/IndexGoodVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel("主页商品Vo") -public class IndexGoodVO { - private Long id; - @ApiModelProperty(value = "产品名称") - private String goodsName; - @ApiModelProperty(value = "产品规格") - private String goodsSpecifications; - @ApiModelProperty(value = "产品图片") - private String goodsPicture; - @ApiModelProperty(value = "1是常用产品,0不是") - private Integer isUsual; - @ApiModelProperty(value = "已购数量") - private Integer count; - public IndexGoodVO() { - // 初始化时,如果 isUsual 为 null,则将其设为 0 - if (this.isUsual == null) { - this.isUsual = 0; - } - if (this.count == null) { - this.count = 0; - } - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/PriceGoodsVo.java b/optometry/src/main/java/com/jilongda/optometry/vo/PriceGoodsVo.java deleted file mode 100644 index 1532215..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/PriceGoodsVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jilongda.optometry.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -@ApiModel("商品表实体") -public class PriceGoodsVo { - - @ApiModelProperty(value = "总经理价格") - private BigDecimal generalManagerPrice; - - @ApiModelProperty(value = "销售总监价格") - private BigDecimal salesDirector; - - @ApiModelProperty(value = "客户经理价格") - private BigDecimal accountManager; - @ApiModelProperty(value = "产品名称") - @TableField("goodInfo") - private String goodInfo; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/SecResourceVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/SecResourceVO.java deleted file mode 100644 index 2ffee5d..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/SecResourceVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jilongda.optometry.vo; - - -import com.jilongda.applet.model.SecResources; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author madman - * @version 1.0 - * @date 2019/8/13 11:56 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel(value = "资源vo") -public class SecResourceVO extends SecResources { - private static final long serialVersionUID = 2932580245701601388L; - @ApiModelProperty(value = "用户是否拥有此权限") - private Boolean flag; - - @ApiModelProperty(value = "子集列表,无则为[]") - private List<SecResourceVO> children = new ArrayList<>(); -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/SecUserRoleResouceVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/SecUserRoleResouceVO.java deleted file mode 100644 index f05f7fd..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/SecUserRoleResouceVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jilongda.optometry.vo; - - -import com.jilongda.applet.model.SecResources; -import com.jilongda.applet.model.SecRole; -import com.jilongda.applet.model.SecUser; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @author xiaochen - * @ClassName SysUserRoleResouceVo - * @Description - * @date 2020-09-23 16:03 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SecUserRoleResouceVO extends SecUser { - private static final long serialVersionUID = -4099422915334750845L; - /** - * 角色 - */ - List<SecRole> roles; - - /** - * 资源 - */ - List<SecResources> resources; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/SecUserVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/SecUserVO.java deleted file mode 100644 index d756415..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/SecUserVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jilongda.optometry.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 10:42 - */ -@Data -@ApiModel("系统用户列表vo实体(通过Role查询)") -public class SecUserVO { - - @ApiModelProperty("角色id") - private Integer roleId; - - @ApiModelProperty("用户id") - private Integer userId; - - @ApiModelProperty("账号姓名") - private String userName; - - @ApiModelProperty("登陆账号") - private String account; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/SecUsersVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/SecUsersVO.java deleted file mode 100644 index 2304b64..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/SecUsersVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jilongda.optometry.vo; - - -import com.jilongda.applet.model.SecRole; -import com.jilongda.applet.model.SecUser; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * <p></p> - * - * @author mouseyCat - * @date 2020/9/3 10:42 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@ApiModel("系统用户列表vo实体") -public class SecUsersVO extends SecUser { - private static final long serialVersionUID = 8351204679799277051L; - @ApiModelProperty("角色名称") - private String rolename; - - @ApiModelProperty("角色id") - private String roleId; - - @ApiModelProperty("角色") - private SecRole secRole; - - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/vo/vo/TOrderVO.java b/optometry/src/main/java/com/jilongda/optometry/vo/vo/TOrderVO.java deleted file mode 100644 index 91befa9..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/vo/vo/TOrderVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jilongda.optometry.vo.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -@ApiModel(value = "订单VO") -public class TOrderVO extends TOrder { - - @ApiModelProperty(value = "订单商品信息") - private List<TOrderGood> orderGoods; - - @ApiModelProperty(value = "公司名") - private String companyName; - - @ApiModelProperty(value = "子公司名") - private String subsidiaryName; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/AccessTokenRespBody.java b/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/AccessTokenRespBody.java deleted file mode 100644 index 76bcd31..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/AccessTokenRespBody.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jilongda.optometry.wx.body.resp; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * AccessToken 全局唯一 - * - * @author xiaochen - */ -@Data -public class AccessTokenRespBody extends RespBody implements Serializable { - - /** - * 获取到的凭证 - */ - @JsonProperty("access_token") - private String accessToken; - /** - * 凭证有效时间,单位:秒 - */ - @JsonProperty("expires_in") - private int expiresIn; - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/Code2SessionRespBody.java b/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/Code2SessionRespBody.java deleted file mode 100644 index 6780a57..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/Code2SessionRespBody.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jilongda.optometry.wx.body.resp; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -@Data -public class Code2SessionRespBody extends RespBody{ - /** - * 用户唯一标识 - */ - @JsonProperty("openid") - private String openid; - /** - * 会话密钥 - */ - @JsonProperty("session_key") - private String sessionKey; - /** - * 用户在开放平台的唯一标识符,若当前小程序已绑定到微信开放平台帐号下会返回,详见 UnionID 机制说明。 - */ - @JsonProperty("unionid") - private String unionid; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/RespBody.java b/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/RespBody.java deleted file mode 100644 index 19254db..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/body/resp/RespBody.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jilongda.optometry.wx.body.resp; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -/** - * @author xiaochen - * @ClassName RespBody - * @Description - * @date 2021-07-28 11:44 - */ -@Data -public class RespBody { - @JsonProperty("errcode") - private Integer errorCode; - - @JsonProperty("errmsg") - private String errorMsg; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/body/resq/Code2SessionResqBody.java b/optometry/src/main/java/com/jilongda/optometry/wx/body/resq/Code2SessionResqBody.java deleted file mode 100644 index b522f78..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/body/resq/Code2SessionResqBody.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jilongda.optometry.wx.body.resq; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -/** - * @author xiaochen - * @ClassName Code2SessionResqBody - * @Description - * @date 2021-07-28 11:47 - */ -@Data -public class Code2SessionResqBody { - @JsonProperty("js_code") - private String jsCode; - - public Code2SessionResqBody build(String jsCode) { - this.jsCode = jsCode; - return this; - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletPhoneEncrypteData.java b/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletPhoneEncrypteData.java deleted file mode 100644 index 6e88f3c..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletPhoneEncrypteData.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jilongda.optometry.wx.pojo; - -import lombok.Data; - -/** - * @author xiaochen - * @ClassName AppletUserDecodeData - * @Description - * @date 2021-08-13 17:46 - * 小程序加密数据体 - * - */ -@Data -public class AppletPhoneEncrypteData { - private String encryptedData; - private String openid; - private String unionid; - private String iv; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserDecodeData.java b/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserDecodeData.java deleted file mode 100644 index c5785af..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserDecodeData.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.jilongda.optometry.wx.pojo; - -import lombok.Data; - -/** - * @author xiaochen - * @ClassName AppletUserDecodeData - * @Description - * @date 2021-08-13 17:46 - * 用户主体信息部分 - * { - * "openId": "OPENID", - * "nickName": "NICKNAME", - * "gender": GENDER, - * "city": "CITY", - * "province": "PROVINCE", - * "country": "COUNTRY", - * "avatarUrl": "AVATARURL", - * "unionId": "UNIONID", - * "watermark": - * { - * "appid":"APPID", - * "timestamp":TIMESTAMP - * } - * } - * 电话部分 - * { - * "phoneNumber": "13580006666", - * "purePhoneNumber": "13580006666", - * "countryCode": "86", - * "watermark": - * { - * "appid":"APPID", - * "timestamp": TIMESTAMP - * } - * } - * - */ -@Data -public class AppletUserDecodeData { - private String openId; - private String unionId; - private String nickName; - private int gender; - private String city; - private String province; - private String country; - private String avatarUrl; - private Watermark watermark; - private String phoneNumber; - private String purePhoneNumber; - private String countryCode; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserEncrypteData.java b/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserEncrypteData.java deleted file mode 100644 index e1d96ec..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/AppletUserEncrypteData.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jilongda.optometry.wx.pojo; - -import lombok.Data; - -/** - * @author xiaochen - * @ClassName AppletUserDecodeData - * @Description - * @date 2021-08-13 17:46 - * 小程序加密数据体 - * - */ -@Data -public class AppletUserEncrypteData extends AppletPhoneEncrypteData { - private String rawData; - private String signature; -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/Watermark.java b/optometry/src/main/java/com/jilongda/optometry/wx/pojo/Watermark.java deleted file mode 100644 index 8a9fd20..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/pojo/Watermark.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jilongda.optometry.wx.pojo; - -import lombok.Data; - -@Data -public class Watermark { - private String appid; - private String timestamp; -} \ No newline at end of file diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/JsonUtils.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/JsonUtils.java deleted file mode 100644 index 86bd402..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/JsonUtils.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.jilongda.common.config.JacksonConfig; -import com.jilongda.common.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; - -import java.io.IOException; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -/** - * Json转换工具类 - * 参考:https://blog.csdn.net/weixin_38413579/article/details/82562634 - * @author madman - */ -@Slf4j -public final class JsonUtils { - - private static final ObjectMapper OM = new ObjectMapper(); - private static final JavaTimeModule timeModule = new JavaTimeModule(); - - /** - * 转换LocalDateTime - */ - static class LocalDateTimeSerializer extends JsonSerializer<LocalDateTime> { - @Override - public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - jsonGenerator.writeString(localDateTime.format(DateTimeFormatter.ofPattern(JacksonConfig.dateTimeFormat))); - } - } - - /** - * 转换LocalDate - */ - static class LocalDateSerializer extends JsonSerializer<LocalDate> { - @Override - public void serialize(LocalDate localDate, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - jsonGenerator.writeString(localDate.format(DateTimeFormatter.ofPattern(JacksonConfig.dateFormat))); - } - } - - /** - * 设置 ObjectMapper - * - * @return - */ - private static ObjectMapper getObjectMapper() { - // 序列化 - timeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer()); - timeModule.addSerializer(LocalDate.class, new LocalDateSerializer()); - // 反序列化 - timeModule.addDeserializer(LocalDateTime.class, - new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(JacksonConfig.dateTimeFormat))); - timeModule.addDeserializer(LocalDate.class, - new LocalDateDeserializer(DateTimeFormatter.ofPattern(JacksonConfig.dateFormat))); - // 允许对象忽略json中不存在的属性 - OM.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - OM.registerModule(timeModule); - return OM; - } - - /** - * 将对象序列化 - */ - public static <T> String toJsonString(T obj) { - try { - ObjectMapper om = getObjectMapper(); - return om.writeValueAsString(obj); - } catch (JsonProcessingException e) { - log.error("转json字符串失败:{}", obj); - return null; - } - } - - /** - * 反序列化对象字符串 - */ - public static <T> T parseObject(String json, Class<T> clazz) { - try { - ObjectMapper om = getObjectMapper(); - return om.readValue(json, clazz); - } catch (JsonProcessingException e) { - throw new ServiceException("反序列化对象字符串失败"); - } - } - - /** - * 反序列化字符串成为对象 - */ - public static <T> T parseObject(String json, TypeReference<T> valueTypeRef) { - try { - ObjectMapper om = getObjectMapper(); - return om.readValue(json, valueTypeRef); - } catch (JsonProcessingException e) { - throw new ServiceException("反序列化字符串成为对象失败"); - } - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/SHA1.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/SHA1.java deleted file mode 100644 index e74bbe2..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/SHA1.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import java.security.MessageDigest; - -public class SHA1 { - - - /** - * 用SHA1算法生成安全签名 - * - * @param str - * @return - * @throws WxException - */ - public static String getSHA1(String str) throws WxException { - try { - // SHA1签名生成 - MessageDigest md = MessageDigest.getInstance("SHA-1"); - md.update(str.getBytes()); - byte[] digest = md.digest(); - StringBuffer hexstr = new StringBuffer(); - String shaHex; - for (int i = 0; i < digest.length; i++) { - shaHex = Integer.toHexString(digest[i] & 0xFF); - if (shaHex.length() < 2) { - hexstr.append(0); - } - hexstr.append(shaHex); - } - return hexstr.toString(); - } catch (Exception e) { - throw new WxException(WxException.ComputeSignatureError); - } - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WebUtils.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WebUtils.java deleted file mode 100644 index d8a4846..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WebUtils.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -/** - * @Author xiaochen - * @Date 2019/08/26 10:28 AM - * @Description - */ -public final class WebUtils { - - private WebUtils() { - } - - /** - * 当前请求 - */ - public static HttpServletRequest request() { - return contextHolder() == null ? null : contextHolder().getRequest(); - } - - /** - * 当前响应 - */ - public static HttpServletResponse response() { - return contextHolder() == null ? null : contextHolder().getResponse(); - } - - /** - * 当前session - */ - public static HttpSession session() { - return request() == null ? null : request().getSession(); - } - - /** - * 当前ServletRequest - */ - public static ServletRequestAttributes contextHolder() { - return (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WeixinProperties.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WeixinProperties.java deleted file mode 100644 index ae1715e..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WeixinProperties.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import lombok.ToString; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author xiaochen - * @ClassName WeixinProperties - * @Description - * @date 2021-07-28 13:55 - */ -@ToString -@Component -@Data -@ConfigurationProperties(prefix = "wx.conf") -public class WeixinProperties { - /** - * 默认开启 - */ - private boolean enabled = true; - /** - * 获取 App ID - * - * @return App ID - */ - @JsonProperty("appId") - private String appId; - /** - * 获取 Mch ID - * - * @return Mch ID - */ - @JsonProperty("mchId") - private String mchId; - - /** - * 获取 secret ID - * - * @return secret ID - */ - @JsonProperty("secretId") - private String secretId; - - /** - * 审批模板id - */ - @JsonProperty("templateApproveId") - private String templateApproveId; - - public String getSecretId() { - return secretId; - } - - public void setSecretId(String secretId) { - this.secretId = secretId; - } - - /** - * HTTP(S) 连接超时时间,单位毫秒 - * - */ - public int getHttpConnectTimeoutMs() { - return 6 * 1000; - } - - /** - * HTTP(S) 读数据超时时间,单位毫秒 - */ - public int getHttpReadTimeoutMs() { - return 8 * 1000; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getMchId() { - return mchId; - } - - public void setMchId(String mchId) { - this.mchId = mchId; - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxAppletTools.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxAppletTools.java deleted file mode 100644 index 5164c8a..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxAppletTools.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import com.jilongda.applet.wx.body.resp.AccessTokenRespBody; -import com.jilongda.applet.wx.body.resp.Code2SessionRespBody; -import com.jilongda.applet.wx.body.resq.Code2SessionResqBody; -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; - -import java.text.MessageFormat; - -/** - * @author xiaochen - * @ClassName WxAppletTools - * @Description - * @date 2020-12-04 13:55 - */ -@Slf4j -public class WxAppletTools { - private final static String ACCESSTOKEN_CACHE_KEY = "accessToken"; - /** - * 请求参数 - * 属性 类型 默认值 必填 说明 - * appid string 是 小程序 appId - * secret string 是 小程序 appSecret - * js_code string 是 登录时获取的 code - * grant_type string 是 授权类型,此处只需填写 authorization_cod - * <p> - * 返回值: - * <p> - * 属性 类型 说明 - * openid string 用户唯一标识 - * session_key string 会话密钥 - * unionid string 用户在开放平台的唯一标识符,若当前小程序已绑定到微信开放平台帐号下会返回,详见 UnionID 机制说明。 - * errcode number 错误码 - * errmsg string 错误信息 - */ - private static final String JSCODE_2_SESSION_URL = "https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code"; - /** - * 请求参数 - * 属性 类型 默认值 必填 说明 - * grant_type string 是 填写 client_credential - * appid string 是 小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态) - * secret string 是 小程序唯一凭证密钥,即 AppSecret,获取方式同 appid - * 返回值 - * Object - * 返回的 JSON 数据包 - * <p> - * 属性 类型 说明 - * access_token string 获取到的凭证 - * expires_in number 凭证有效时间,单位:秒。目前是7200秒之内的值。 - * errcode number 错误码 - * errmsg string 错误信息 - */ - public static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}"; - private WeixinProperties wxConfig; - private RestTemplate wxRestTemplate; - private WxCacheTemplate<String> wxCacheTemplate; - - public WxAppletTools(RestTemplate wxRestTemplate, WeixinProperties wxConfig, WxCaffineCache wxCacheTemplate) { - this.wxRestTemplate = wxRestTemplate; - this.wxCacheTemplate = wxCacheTemplate; - this.wxConfig = wxConfig; - } - - public WxAppletTools(RestTemplate wxRestTemplate, WeixinProperties wxConfig) { - this.wxRestTemplate = wxRestTemplate; - this.wxConfig = wxConfig; - } - - /** - * 自定义部分数据 - * - * @param wxConfig - * @return - */ - public WxAppletTools build(WeixinProperties wxConfig) { - this.wxConfig = wxConfig; - return this; - } - - /** - * @param resqBody - * @return - */ - public Code2SessionRespBody getOpenIdByJscode2session(Code2SessionResqBody resqBody) { - long start = System.currentTimeMillis(); - String requestUrl = MessageFormat.format(JSCODE_2_SESSION_URL, wxConfig.getAppId(), wxConfig.getSecretId(), resqBody.getJsCode()); - long end = System.currentTimeMillis(); - log.info("code换取sessionKey时间:{}", (end - start)); - String respBody = wxRestTemplate.getForEntity(requestUrl, String.class).getBody(); - end = System.currentTimeMillis(); - log.info("code换取sessionKey时间:{}", (end - start)); - log.info("Jscode2session:{}", respBody); - Code2SessionRespBody code2SessionRespBody = WxJsonUtils.parseObject(respBody, Code2SessionRespBody.class); - // 判断有误异常 - if (StringUtils.hasLength(code2SessionRespBody.getErrorMsg())) { - // 抛出错误 - throw new WxException(code2SessionRespBody.getErrorCode() + ":" + code2SessionRespBody.getErrorMsg()); - } - return code2SessionRespBody; - } - - /** - * @return - */ - public String getAccessToken() { - String accessToken = wxCacheTemplate.getKey(ACCESSTOKEN_CACHE_KEY); - if (StringUtils.hasLength(accessToken)) { - return accessToken; - } - String requestUrl = MessageFormat.format(ACCESS_TOKEN_URL, wxConfig.getAppId(), wxConfig.getSecretId()); - String respBody = wxRestTemplate.getForEntity(requestUrl, String.class).getBody(); - AccessTokenRespBody accessTokenRespBody = WxJsonUtils.parseObject(respBody, AccessTokenRespBody.class); - // 判断有误异常 - if (StringUtils.hasLength(accessTokenRespBody.getErrorMsg())) { - // 抛出错误 - throw new WxException(accessTokenRespBody.getErrorCode() + ":" + accessTokenRespBody.getErrorMsg()); - } - wxCacheTemplate.setKey(ACCESSTOKEN_CACHE_KEY, accessTokenRespBody.getAccessToken()); - return accessTokenRespBody.getAccessToken(); - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCache.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCache.java deleted file mode 100644 index b9e25ef..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCache.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import java.util.concurrent.TimeUnit; - -/** - * 缓存 - * - * @author xiaochen - */ -class WxCache { - /** - * 缓存的初始化容量 - */ - private int initialCapacity = 50; - /** - * 缓存最大容量 - */ - private long maximumSize = 200L; - /** - * 缓存时长 - */ - private long duration = 7000L; - /** - * 时长单位,自动转换 - * 支持: - * 时 - * 分 - * 秒 - * 天 - */ - private TimeUnit timeunit = TimeUnit.SECONDS; - - public int getInitialCapacity() { - return initialCapacity; - } - - public void setInitialCapacity(int initialCapacity) { - this.initialCapacity = initialCapacity; - } - - public long getMaximumSize() { - return maximumSize; - } - - public void setMaximumSize(long maximumSize) { - this.maximumSize = maximumSize; - } - - - public long getDuration() { - return duration; - } - - public void setDuration(long duration) { - this.duration = duration; - } - - public TimeUnit getTimeunit() { - return timeunit; - } - - public void setTimeunit(TimeUnit timeunit) { - this.timeunit = timeunit; - } - - public static class Builder { - private int initialCapacity; - private long maximumSize; - private long duration; - private TimeUnit timeunit; - - public Builder setInitialCapacity(int initialCapacity) { - this.initialCapacity = initialCapacity; - return this; - } - - public Builder setMaximumSize(long maximumSize) { - this.maximumSize = maximumSize; - return this; - } - - public Builder setDuration(long duration) { - this.duration = duration; - return this; - } - - public Builder setTimeUnit(TimeUnit timeunit) { - this.timeunit = timeunit; - return this; - } - - public WxCache build() { - return new WxCache(this); - } - } - - public static Builder options() { - return new Builder(); - } - - private WxCache(Builder builder) { - this.initialCapacity = 0 == builder.initialCapacity ? this.initialCapacity : builder.initialCapacity; - this.maximumSize = 0L == builder.maximumSize ? this.maximumSize : builder.maximumSize; - this.duration = 0L == builder.duration ? this.duration : builder.duration; - this.timeunit = null == builder.timeunit ? this.timeunit : builder.timeunit; - } - - @Override - public String toString() { - return "WxCache{" + - "initialCapacity=" + initialCapacity + - ", maximumSize=" + maximumSize + - ", duration=" + duration + - ", timeunit=" + timeunit + - '}'; - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCacheTemplate.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCacheTemplate.java deleted file mode 100644 index 7250dd7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCacheTemplate.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -/** - * @author xiaochen - * @ClassName WxCacheTemplate - * @Description - * @date 2021-01-11 11:27 - */ -public interface WxCacheTemplate<T> { - /** - * 保存key - * - * @param key - * @param value - * @return - */ - boolean setKey(String key, T value); - - /** - * 获取缓存 - * - * @param key - * @return - */ - T getKey(String key); - - /** - * 删除 - * - * @param key - * @return - */ - boolean delKey(String key); -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCaffineCache.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCaffineCache.java deleted file mode 100644 index 01ff8f5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxCaffineCache.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.cglib.core.internal.LoadingCache; -import org.springframework.util.StringUtils; - -import java.util.Objects; -import java.util.concurrent.TimeUnit; - -/** - * @author xiaochen - * @ClassName AbstractCaffineCache - * @Description - * @date 2021-01-11 11:27 - */ -@Slf4j -class WxCaffineCache<T> implements WxCacheTemplate<T> { - /** - * 缓存环境 - */ - private String env = "wx"; - - /** - * 本地缓存实例 - */ - private LoadingCache<String, Object> loadingCache; - - /** - * 构造函数 - * - */ - public WxCaffineCache() { - WxCache cache = WxCache.options().setTimeUnit(TimeUnit.SECONDS).build(); - // 构建本地缓存实例 - this.loadingCache = caffineCacheManage(cache); - } - - - @Override - public boolean setKey(String key, T value) { - if (Objects.isNull(this.loadingCache)) { - return Boolean.FALSE; - } - if (StringUtils.hasLength(this.env)) { - this.loadingCache.put(this.env + ":" + key, value); - } else { - this.loadingCache.put(key, value); - } - return Boolean.TRUE; - } - - @Override - public T getKey(String key) { - if (Objects.isNull(this.loadingCache)) { - return null; - } - try { - if (StringUtils.hasLength(this.env)) { - return (T) this.loadingCache.get(this.env + ":" + key); - } else { - return (T) this.loadingCache.get(key); - } - } catch (Exception e) { - return null; - } - } - - @Override - public boolean delKey(String key) { - if (Objects.isNull(this.loadingCache)) { - return Boolean.FALSE; - } - if (StringUtils.hasLength(this.env)) { - this.loadingCache.invalidate(this.env + ":" + key); - } else { - this.loadingCache.invalidate(key); - } - return Boolean.TRUE; - } - - /** - * 缓存管理 - * - * @param cache - * @param <T> - * @return - */ - private static <T> LoadingCache<String, T> caffineCacheManage(WxCache cache) { - log.info("初始化缓存的实体数据:{}", cache); - if (Objects.isNull(cache)) { - throw new NullPointerException("请实例化一个Cache对象!"); - } - LoadingCache<String, T> localcache = - // 构建本地缓存,调用链的方式 - // ,1000是设置缓存的初始化容量,maximumSize是设置缓存最大容量,当超过了最大容量,guava将使用LRU算法(最少使用算法),来移除缓存项 - // expireAfterAccess(12,TimeUnit.HOURS)设置缓存有效期为12个小时 - Caffeine.newBuilder().initialCapacity(cache.getInitialCapacity()).maximumSize(cache.getMaximumSize()) - // 设置写缓存后n秒钟过期 - // .expireAfterWrite(30, TimeUnit.SECONDS) - .expireAfterWrite(cache.getDuration(), cache.getTimeunit()) - // 设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite - //.expireAfterAccess(googleCache.getDuration(), googleCache.getTimeunit()) - // 只阻塞当前数据加载线程,其他线程返回旧值 - //.refreshAfterWrite(10, TimeUnit.SECONDS) - // 设置缓存的移除通知//用户手动移除EXPLICIT, - // //用户手动替换REPLACED,//被垃圾回收COLLECTED,//超时过期EXPIRED,//SIZE由于缓存大小限制 - .removalListener(new RemovalListener<String, T>() { - @Override - public void onRemoval(String key, Object value, RemovalCause cause) { - log.info(key + ":" + value + ":" + cause.name()); - } - }) - // build里面要实现一个匿名抽象类 - .build(new CacheLoader<String, T>() { - // 这个方法是默认的数据加载实现,get的时候,如果key没有对应的值,就调用这个方法进行加载。此处是没有默认值则返回null - @Override - public T load(String key) throws Exception { - return null; - } - }); - return localcache; - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxException.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxException.java deleted file mode 100644 index 728f5ca..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxException.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -/** - * @author xiaochen - */ -public class WxException extends RuntimeException { - - private final static int OK = 0; - private final static int ValidateSignatureError = -40001; - private final static int ParseXmlError = -40002; - public final static int ComputeSignatureError = -40003; - private final static int IllegalAesKey = -40004; - private final static int ValidateAppidError = -40005; - private final static int EncryptAESError = -40006; - private final static int DecryptAESError = -40007; - private final static int IllegalBuffer = -40008; - - private int code; - - private static String getMessage(int code) { - switch (code) { - case ValidateSignatureError: - return "签名验证错误"; - case ParseXmlError: - return "xml解析失败"; - case ComputeSignatureError: - return "sha加密生成签名失败"; - case IllegalAesKey: - return "SymmetricKey非法"; - case ValidateAppidError: - return "appid校验失败"; - case EncryptAESError: - return "aes加密失败"; - case DecryptAESError: - return "aes解密失败"; - case IllegalBuffer: - return "解密后得到的buffer非法"; - default: - return null; - } - } - - public int getCode() { - return code; - } - - WxException(int code) { - super(getMessage(code)); - this.code = code; - } - - public WxException(String message) { - super(message); - } -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxJsonUtils.java b/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxJsonUtils.java deleted file mode 100644 index 0b906a7..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wx/utils/WxJsonUtils.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.jilongda.optometry.wx.utils; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import lombok.extern.slf4j.Slf4j; - -import java.io.IOException; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -/** - * Json转换工具类 - * 参考:https://blog.csdn.net/weixin_38413579/article/details/82562634 - * @author madman - */ -@Slf4j -public final class WxJsonUtils { - public static final String dateFormat = "yyyy-MM-dd"; - public static final String dateTimeFormat = "yyyy-MM-dd HH:mm:ss"; - private static final ObjectMapper OM = new ObjectMapper(); - private static final JavaTimeModule timeModule = new JavaTimeModule(); - - /** - * 转换LocalDateTime - */ - static class LocalDateTimeSerializer extends JsonSerializer<LocalDateTime> { - @Override - public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - jsonGenerator.writeString(localDateTime.format(DateTimeFormatter.ofPattern(dateTimeFormat))); - } - } - - /** - * 转换LocalDate - */ - static class LocalDateSerializer extends JsonSerializer<LocalDate> { - @Override - public void serialize(LocalDate localDate, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - jsonGenerator.writeString(localDate.format(DateTimeFormatter.ofPattern(dateFormat))); - } - } - - /** - * 设置 ObjectMapper - * - * @return - */ - private static ObjectMapper getObjectMapper() { - // 序列化 - timeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer()); - timeModule.addSerializer(LocalDate.class, new LocalDateSerializer()); - // 反序列化 - timeModule.addDeserializer(LocalDateTime.class, - new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(dateTimeFormat))); - timeModule.addDeserializer(LocalDate.class, - new LocalDateDeserializer(DateTimeFormatter.ofPattern(dateFormat))); - // 允许对象忽略json中不存在的属性 - OM.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - OM.registerModule(timeModule); - return OM; - } - - /** - * 将对象序列化 - */ - public static <T> String toJsonString(T obj) { - try { - ObjectMapper om = getObjectMapper(); - return om.writeValueAsString(obj); - } catch (JsonProcessingException e) { - log.error("转json字符串失败:{}", obj); - return null; - } - } - - /** - * 反序列化对象字符串 - */ - public static <T> T parseObject(String json, Class<T> clazz) { - try { - ObjectMapper om = getObjectMapper(); - return om.readValue(json, clazz); - } catch (JsonProcessingException e) { - throw new RuntimeException("反序列化对象字符串失败"); - } - } - - /** - * 反序列化字符串成为对象 - */ - public static <T> T parseObject(String json, TypeReference<T> valueTypeRef) { - try { - ObjectMapper om = getObjectMapper(); - return om.readValue(json, valueTypeRef); - } catch (JsonProcessingException e) { - throw new RuntimeException("反序列化字符串成为对象失败"); - } - } - -} diff --git a/optometry/src/main/java/com/jilongda/optometry/wxtemplate/Template.java b/optometry/src/main/java/com/jilongda/optometry/wxtemplate/Template.java deleted file mode 100644 index 7c1d5e5..0000000 --- a/optometry/src/main/java/com/jilongda/optometry/wxtemplate/Template.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jilongda.optometry.wxtemplate; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description 微信消息模板参数实体 - * @Author xiaochen - * @Date 2021/11/8 10:30 - */ -@Data -public class Template implements Serializable{ - - @ApiModelProperty(value = "消息内容") - private String value; - -} diff --git a/optometry/src/main/resources/application.yml b/optometry/src/main/resources/application.yml deleted file mode 100644 index c34c89c..0000000 --- a/optometry/src/main/resources/application.yml +++ /dev/null @@ -1,197 +0,0 @@ -server: - port: 9092 - tomcat: - max-swallow-size: 500MB - servlet: - context-path: /optometry -spring: - thymeleaf: - cache: false - servlet: - multipart: - max-file-size: 500MB - max-request-size: 500MB - resolve-lazily: true #设置为懒加载,不然依然会捕获不到异常 - profiles: - active: dev - main: - allow-bean-definition-overriding: true - rabbitmq: - host: localhost - port: 5672 - username: guest #正式环境 - password: guest #正式环境 - #sagger文档属性配置 - mvc: - static-path-pattern: /** - pathmatch: - matching-strategy: ant_path_matcher -web: - swagger: - enabled: true - service-url: / - title: 验光师-接口文档 - description: 请求方式(application/json; charset=utf-8) - contact: - email: chenkun@lingser.com - name: 无关风月 - req-fixed-parameters: - - { paramKey: 'token', description: '登录返回的token',required: false } -# mybatis -mybatis-plus: - # 此处在多数据源中生效 - config-location: classpath:/mybatis-config.xml - global-config: - banner: false - db-config: - logic-not-delete-value: 0 - logic-delete-value: 1 - # 指定Mapper文件位置 - mapper-locations: classpath*:mapping/*.xml -logging: - file: - # path 及 name只能二选一,自定义名称选name,path的默认文件名spring.log - # path: /logs - name: logs/app.log - logback: - rollingpolicy: - max-history: 3 - level: - com: - sales: - manage: debug -debug: true -# 微信SDK -wx: - conf: - # 开启或关闭,默认开启,当支付信息无效时不能正常启动项目,可设为false - enabled: true - appId: wxb17e909bb2b1975f - secretId: eee8aae16bab075f1b3e51784e5dff6d - templateApproveId: jAt2UR8LtaDplqwHQFmAjvaqdLY0WVo16CVYKoZtcuo #申请审批消息模板id -#OSS及短信配置 -oss: - config: - templateCodeTest: "SMS_154950909" - signNameTest: "阿里云短信测试" - accessKeyId: LTAI5tPFeEGX87j4bwcmjyqV - accessKeySecret: lRVBAYB7bTVAMd0OjakACAALG0jFXl - endpoint: oss-cn-shanghai.aliyuncs.com - bucketName: sales-bucket - cdn: - signName: "药零科技" - templateCode: SMS_244030342 - - shareTemplateCode: SMS_251096901 - -file: - url: - ae: https://xsbf-2022.oss-cn-shanghai.aliyuncs.com/sales/1662966519668SAFETY%20DATA%20AND%20QUALITY%281%29.docx - sign: https://nn-bucket.oss-cn-shanghai.aliyuncs.com/sales/1663849389027%E7%AD%BE%E5%88%B0%E8%A1%A8%EF%BC%88%E4%B8%8B%E8%BD%BD%E6%A8%A1%E6%9D%BF%EF%BC%89.docx - cost: https://xsbf-2022.oss-cn-shanghai.aliyuncs.com/sales/1662966747647%E8%B4%B9%E7%94%A8%E7%A1%AE%E8%AE%A4%E8%A1%A8%E6%A8%A1%E6%9D%BF.xlsx - beforeActivityUrl: https://nn-bucket.oss-cn-shanghai.aliyuncs.com/sales/1663849178786%E6%B4%BB%E5%8A%A8%E5%89%8D%E8%AE%B2%E8%80%85%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE-%E5%8D%95%E6%AC%A1%E8%AE%B2%E8%AF%BE%EF%BC%88%E4%B8%8B%E8%BD%BD%E6%A8%A1%E6%9D%BF%EF%BC%89.docx - afterActivityUrl: https://nn-bucket.oss-cn-shanghai.aliyuncs.com/sales/1663849357042%E6%B4%BB%E5%8A%A8%E5%90%8E%E8%AE%B2%E8%80%85%E7%A1%AE%E8%AE%A4%E4%B9%A6%EF%BC%88%E4%B8%8B%E8%BD%BD%E6%A8%A1%E7%89%88%EF%BC%89.docx - yaoqinghanUrl: https://nn-bucket.oss-cn-shanghai.aliyuncs.com/sales/1666341482675%E4%BC%9A%E8%AE%AE%E9%82%80%E8%AF%B7%E5%87%BD.docx - uri: https://nncdn.pharmacylinked.com -#测试环境 ---- -spring: - config: - activate: - on-profile: dev - # 数据源 - datasource: - username: root #测试环境 - password: root - url: jdbc:mysql://192.168.110.64:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - minimum-idle: 10 - # 连接池大小 = (核心数*2 + 有效磁盘数) - maximum-pool-size: 5 - auto-commit: true - idle-timeout: 30000 - pool-name: DatebookHikariCP-Applet - max-lifetime: 1800000 - connection-timeout: 30000 - connection-test-query: SELECT 1 - redis: - #测试环境 - host: 127.0.0.1 - port: 6379 - timeout: 5000 - database: 10 - password: 123456 -alipay: - appid: "" - appPrivateKey: "" - alipayPublicKey: "" - alipay_public_key: "" -wx: - appid: "" - mchId: "" - key: -callbackPath: "" - -hw: - sms: - url: "url" - appKey: "appKey" - appSecret: "appSecret" - sender: "sender" - templateId: "templateId" - signature: "signature" - -#正式环境 ---- -spring: - config: - activate: - on-profile: prod - # 数据源 - datasource: - username: root - password: Xiwang2024! - url: jdbc:mysql://120.26.112.122:3306/jilongda?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - minimum-idle: 10 - # 连接池大小 = (核心数*2 + 有效磁盘数) - maximum-pool-size: 5 - auto-commit: true - idle-timeout: 30000 - pool-name: DatebookHikariCP-Applet - max-lifetime: 1800000 - connection-timeout: 30000 - connection-test-query: SELECT 1 - redis: - host: 120.26.112.122 - port: 6379 - timeout: 5000 - database: 1 - password: xsbf@2022 -alipay: - appid: "" - appPrivateKey: "" - alipayPublicKey: "" - alipay_public_key: "" -wx: - appid: "" - mchId: "" - key: -callbackPath: "" - - -hw: - sms: - url: "url" - appKey: "appKey" - appSecret: "appSecret" - sender: "sender" - templateId: "templateId" - signature: "signature" - - - diff --git a/optometry/src/main/resources/mapping/LoginLogMapper.xml b/optometry/src/main/resources/mapping/LoginLogMapper.xml deleted file mode 100644 index 6cd8c27..0000000 --- a/optometry/src/main/resources/mapping/LoginLogMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.LoginLogMapper"> - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.common.model.LoginLog"> - <id column="id" property="id"/> - <result column="user_name" property="userName"/> - <result column="account" property="account"/> - <result column="work_address" property="workAddress"/> - <result column="login_address" property="loginAddress"/> - <result column="login_time" property="loginTime"/> - <result column="login_ip" property="loginIp"/> - <result column="equipment" property="equipment"/> - <result column="open_id" property="openId"/> - <result column="applet_or_manage" property="appletOrManage"/> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id - , user_name, account, work_address, login_address, login_time, login_ip,equipment,open_id,applet_or_manage - </sql> - - <select id="pageList" resultMap="BaseResultMap"> - select - <include refid="Base_Column_List"> - </include> - from login_log - <where> - <if test="query.account != null and query.account != ''"> - AND account like concat('%',#{query.account},'%') - </if> - <if test="query.shortName != null and query.shortName != ''"> - AND user_name like concat('%',#{query.shortName},'%') - </if> - <if test="query.startTime != null and query.endTime != null"> - AND DATE_FORMAT(login_time, '%Y-%m-%d %H:%i:%s') >= #{query.startTime} - AND DATE_FORMAT(login_time, '%Y-%m-%d %H:%i:%s') <= #{query.endTime} - </if> - </where> - ORDER BY login_time DESC - </select> - <select id="countToday" resultType="java.lang.Long"> - select count(DISTINCT (account)) - from login_log - where login_time like concat('%', #{today,jdbcType=DATE}, '%') - </select> - <select id="countYesterday" resultType="java.lang.Long"> - select count(DISTINCT (account)) - from login_log - where login_time like concat('%', #{yesterday,jdbcType=DATE}, '%') - </select> -</mapper> diff --git a/optometry/src/main/resources/mapping/SecFeeItemsMapper.xml b/optometry/src/main/resources/mapping/SecFeeItemsMapper.xml deleted file mode 100644 index a83f357..0000000 --- a/optometry/src/main/resources/mapping/SecFeeItemsMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecFeeItemsMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecFeeItems"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="percent" property="percent" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, percent, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecResourcesMapper.xml b/optometry/src/main/resources/mapping/SecResourcesMapper.xml deleted file mode 100644 index 93ca5cb..0000000 --- a/optometry/src/main/resources/mapping/SecResourcesMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecResourcesMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecResources"> - <id column="id" property="id" /> - <result column="parent_id" property="parentId" /> - <result column="title" property="title" /> - <result column="descriptions" property="descriptions" /> - <result column="sort" property="sort" /> - <result column="icon" property="icon" /> - <result column="name" property="name" /> - <result column="menu" property="menu" /> - <result column="component" property="component" /> - <result column="permit" property="permit" /> - <result column="cate" property="cate" /> - <result column="type" property="type" /> - <result column="hidden" property="hidden" /> - <result column="env_port" property="envPort" /> - <result column="path" property="path" /> - <result column="api_url" property="apiUrl" /> - <result column="createBy" property="createBy" /> - <result column="createTime" property="createTime" /> - <result column="updateBy" property="updateBy" /> - <result column="updateTime" property="updateTime" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, parent_id, title, descriptions, sort, icon, name, menu, component, permit, cate, type, hidden, env_port, path, api_url, createBy, createTime, updateBy, updateTime, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecRoleMapper.xml b/optometry/src/main/resources/mapping/SecRoleMapper.xml deleted file mode 100644 index 276d108..0000000 --- a/optometry/src/main/resources/mapping/SecRoleMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecRoleMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecRole"> - <id column="id" property="id" /> - <result column="rolename" property="rolename" /> - <result column="role_desc" property="roleDesc" /> - <result column="role_state" property="roleState" /> - <result column="createBy" property="createBy" /> - <result column="createTime" property="createTime" /> - <result column="updateBy" property="updateBy" /> - <result column="updateTime" property="updateTime" /> - <result column="isDelete" property="isDelete" /> - <result column="sortBy" property="sortBy" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, rolename, role_desc, role_state, createBy, createTime, updateBy, updateTime, isDelete, sortBy - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecRoleResourceMapper.xml b/optometry/src/main/resources/mapping/SecRoleResourceMapper.xml deleted file mode 100644 index afd7bae..0000000 --- a/optometry/src/main/resources/mapping/SecRoleResourceMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecRoleResourceMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecRoleResource"> - <result column="role_id" property="roleId" /> - <result column="resource_id" property="resourceId" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - role_id, resource_id - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecSettingMapper.xml b/optometry/src/main/resources/mapping/SecSettingMapper.xml deleted file mode 100644 index cb55290..0000000 --- a/optometry/src/main/resources/mapping/SecSettingMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecSettingMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecSetting"> - <id column="id" property="id" /> - <result column="lensThreshold" property="lensThreshold" /> - <result column="frameThreshold" property="frameThreshold" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, lensThreshold, frameThreshold, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecUserMapper.xml b/optometry/src/main/resources/mapping/SecUserMapper.xml deleted file mode 100644 index d2ec8f9..0000000 --- a/optometry/src/main/resources/mapping/SecUserMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecUserMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecUser"> - <id column="id" property="id" /> - <result column="account" property="account" /> - <result column="description" property="description" /> - <result column="password" property="password" /> - <result column="phone" property="phone" /> - <result column="state" property="state" /> - <result column="last_login_time" property="lastLoginTime" /> - <result column="createBy" property="createBy" /> - <result column="createTime" property="createTime" /> - <result column="updateBy" property="updateBy" /> - <result column="updateTime" property="updateTime" /> - <result column="isDelete" property="isDelete" /> - <result column="nick_name" property="nickName" /> - <result column="avatar_url" property="avatarUrl" /> - <result column="province" property="province" /> - <result column="city" property="city" /> - <result column="area" property="area" /> - <result column="address" property="address" /> - <result column="birthday" property="birthday" /> - <result column="gender" property="gender" /> - <result column="deptId" property="deptId" /> - <result column="userType" property="userType" /> - <result column="provinceCode" property="provinceCode" /> - <result column="cityCode" property="cityCode" /> - <result column="areaCode" property="areaCode" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, account, description, password, phone, state, last_login_time, createBy, createTime, updateBy, updateTime, isDelete, nick_name, avatar_url, province, city, area, address, birthday, gender, deptId, userType, provinceCode, cityCode, areaCode - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/SecUserRoleMapper.xml b/optometry/src/main/resources/mapping/SecUserRoleMapper.xml deleted file mode 100644 index 011c980..0000000 --- a/optometry/src/main/resources/mapping/SecUserRoleMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.SecUserRoleMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.SecUserRole"> - <result column="role_id" property="roleId" /> - <result column="user_id" property="userId" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - role_id, user_id - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TAppUserMapper.xml b/optometry/src/main/resources/mapping/TAppUserMapper.xml deleted file mode 100644 index 371b545..0000000 --- a/optometry/src/main/resources/mapping/TAppUserMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TAppUserMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TAppUser"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="phone" property="phone" /> - <result column="realName" property="realName" /> - <result column="age" property="age" /> - <result column="gender" property="gender" /> - <result column="registerTime" property="registerTime" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, phone, realName, age, gender, registerTime, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TBrandMapper.xml b/optometry/src/main/resources/mapping/TBrandMapper.xml deleted file mode 100644 index cc6e2ba..0000000 --- a/optometry/src/main/resources/mapping/TBrandMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TBrandMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TBrand"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="type" property="type" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="isMain" property="isMain" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, type, status, createTime, updateTime, createBy, updateBy, isDelete, isMain - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TCouponMapper.xml b/optometry/src/main/resources/mapping/TCouponMapper.xml deleted file mode 100644 index 984e85d..0000000 --- a/optometry/src/main/resources/mapping/TCouponMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TCouponMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TCoupon"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="type" property="type" /> - <result column="amount" property="amount" /> - <result column="storeId" property="storeId" /> - <result column="time" property="time" /> - <result column="amountCondition" property="amountCondition" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="grantStatus" property="grantStatus" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, type, amount, storeId, time, amountCondition, createTime, updateTime, createBy, updateBy, isDelete, grantStatus - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TCouponReceiveMapper.xml b/optometry/src/main/resources/mapping/TCouponReceiveMapper.xml deleted file mode 100644 index 34aeede..0000000 --- a/optometry/src/main/resources/mapping/TCouponReceiveMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TCouponReceiveMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TCouponReceive"> - <id column="id" property="id" /> - <result column="couponId" property="couponId" /> - <result column="userId" property="userId" /> - <result column="type" property="type" /> - <result column="amount" property="amount" /> - <result column="storeId" property="storeId" /> - <result column="endTime" property="endTime" /> - <result column="amountCondition" property="amountCondition" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, couponId, userId, type, amount, storeId, endTime, amountCondition, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml b/optometry/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml deleted file mode 100644 index a3088d2..0000000 --- a/optometry/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TFrameWarehousingDetailMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TFrameWarehousingDetail"> - <id column="id" property="id" /> - <result column="warehousingId" property="warehousingId" /> - <result column="brand" property="brand" /> - <result column="supplier" property="supplier" /> - <result column="material" property="material" /> - <result column="total" property="total" /> - <result column="count" property="count" /> - <result column="color" property="color" /> - <result column="model" property="model" /> - <result column="code" property="code" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="modelId" property="modelId" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, warehousingId, brand, supplier, material, total, count, color, model, code, createTime, updateTime, createBy, updateBy, isDelete, modelId - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TInventoryFrameDetailMapper.xml b/optometry/src/main/resources/mapping/TInventoryFrameDetailMapper.xml deleted file mode 100644 index 33fb769..0000000 --- a/optometry/src/main/resources/mapping/TInventoryFrameDetailMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TInventoryFrameDetailMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TInventoryFrameDetail"> - <id column="id" property="id" /> - <result column="inventoryId" property="inventoryId" /> - <result column="brand" property="brand" /> - <result column="supplier" property="supplier" /> - <result column="material" property="material" /> - <result column="total" property="total" /> - <result column="category" property="category" /> - <result column="color" property="color" /> - <result column="model" property="model" /> - <result column="count" property="count" /> - <result column="diff" property="diff" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, inventoryId, brand, supplier, material, total, category, color, model, count, diff, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TInventoryLensDetailMapper.xml b/optometry/src/main/resources/mapping/TInventoryLensDetailMapper.xml deleted file mode 100644 index 2310517..0000000 --- a/optometry/src/main/resources/mapping/TInventoryLensDetailMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TInventoryLensDetailMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TInventoryLensDetail"> - <id column="id" property="id" /> - <result column="inventoryId" property="inventoryId" /> - <result column="series" property="series" /> - <result column="type" property="type" /> - <result column="total" property="total" /> - <result column="count" property="count" /> - <result column="diff" property="diff" /> - <result column="refractiveIndex" property="refractiveIndex" /> - <result column="ballMirror" property="ballMirror" /> - <result column="columnMirror" property="columnMirror" /> - <result column="category" property="category" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, inventoryId, series, type, total, count, diff, refractiveIndex, ballMirror, columnMirror, category, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TInventoryMapper.xml b/optometry/src/main/resources/mapping/TInventoryMapper.xml deleted file mode 100644 index 99a9284..0000000 --- a/optometry/src/main/resources/mapping/TInventoryMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TInventoryMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TInventory"> - <id column="id" property="id" /> - <result column="status" property="status" /> - <result column="type" property="type" /> - <result column="storeId" property="storeId" /> - <result column="remark" property="remark" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, status, type, storeId, remark, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TLensSeriesMapper.xml b/optometry/src/main/resources/mapping/TLensSeriesMapper.xml deleted file mode 100644 index f78ff15..0000000 --- a/optometry/src/main/resources/mapping/TLensSeriesMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TLensSeriesMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TLensSeries"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="brandId" property="brandId" /> - <result column="supplierId" property="supplierId" /> - <result column="type" property="type" /> - <result column="sphere" property="sphere" /> - <result column="asphericSurface" property="asphericSurface" /> - <result column="doubleNon" property="doubleNon" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, brandId, supplierId, type, sphere, asphericSurface, doubleNon, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TLensWarehousingDetailMapper.xml b/optometry/src/main/resources/mapping/TLensWarehousingDetailMapper.xml deleted file mode 100644 index 1091498..0000000 --- a/optometry/src/main/resources/mapping/TLensWarehousingDetailMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TLensWarehousingDetailMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TLensWarehousingDetail"> - <id column="id" property="id" /> - <result column="brand" property="brand" /> - <result column="supplier" property="supplier" /> - <result column="series" property="series" /> - <result column="refractiveIndex" property="refractiveIndex" /> - <result column="ballMirror" property="ballMirror" /> - <result column="columnMirror" property="columnMirror" /> - <result column="type" property="type" /> - <result column="total" property="total" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="count" property="count" /> - <result column="seriesId" property="seriesId" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, brand, supplier, series, refractiveIndex, ballMirror, columnMirror, type, total, createTime, updateTime, createBy, updateBy, isDelete, count, seriesId - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TLineUpMapper.xml b/optometry/src/main/resources/mapping/TLineUpMapper.xml deleted file mode 100644 index 3dc9f2b..0000000 --- a/optometry/src/main/resources/mapping/TLineUpMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TLineUpMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TLineUp"> - <id column="id" property="id" /> - <result column="code" property="code" /> - <result column="userId" property="userId" /> - <result column="optometristId" property="optometristId" /> - <result column="storeId" property="storeId" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, code, userId, optometristId, storeId, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TMaterialMapper.xml b/optometry/src/main/resources/mapping/TMaterialMapper.xml deleted file mode 100644 index 216fbe4..0000000 --- a/optometry/src/main/resources/mapping/TMaterialMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TMaterialMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TMaterial"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TModelMapper.xml b/optometry/src/main/resources/mapping/TModelMapper.xml deleted file mode 100644 index a4ccad2..0000000 --- a/optometry/src/main/resources/mapping/TModelMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TModelMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TModel"> - <id column="id" property="id" /> - <result column="brandId" property="brandId" /> - <result column="supplierId" property="supplierId" /> - <result column="materialId" property="materialId" /> - <result column="color" property="color" /> - <result column="sale" property="sale" /> - <result column="cost" property="cost" /> - <result column="name" property="name" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, brandId, supplierId, materialId, color, sale, cost, name, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOptometristMapper.xml b/optometry/src/main/resources/mapping/TOptometristMapper.xml deleted file mode 100644 index ba12e0f..0000000 --- a/optometry/src/main/resources/mapping/TOptometristMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOptometristMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOptometrist"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="phone" property="phone" /> - <result column="status" property="status" /> - <result column="storeId" property="storeId" /> - <result column="img" property="img" /> - <result column="registerTime" property="registerTime" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, phone, status, storeId, img, registerTime, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOptometryDetailMapper.xml b/optometry/src/main/resources/mapping/TOptometryDetailMapper.xml deleted file mode 100644 index 49403f0..0000000 --- a/optometry/src/main/resources/mapping/TOptometryDetailMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOptometryDetailMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOptometryDetail"> - <id column="id" property="id" /> - <result column="type" property="type" /> - <result column="optometryId" property="optometryId" /> - <result column="ballMirror" property="ballMirror" /> - <result column="columnMirror" property="columnMirror" /> - <result column="axis" property="axis" /> - <result column="add" property="add" /> - <result column="pupilHeight" property="pupilHeight" /> - <result column="pupilDistance" property="pupilDistance" /> - <result column="correct" property="correct" /> - <result column="storeId" property="storeId" /> - <result column="status" property="status" /> - <result column="registerTime" property="registerTime" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, type, optometryId, ballMirror, columnMirror, axis, add, pupilHeight, pupilDistance, correct, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOptometryMapper.xml b/optometry/src/main/resources/mapping/TOptometryMapper.xml deleted file mode 100644 index 43ecc7d..0000000 --- a/optometry/src/main/resources/mapping/TOptometryMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOptometryMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOptometry"> - <id column="id" property="id" /> - <result column="code" property="code" /> - <result column="userId" property="userId" /> - <result column="age" property="age" /> - <result column="gender" property="gender" /> - <result column="name" property="name" /> - <result column="phone" property="phone" /> - <result column="optometristId" property="optometristId" /> - <result column="storeId" property="storeId" /> - <result column="status" property="status" /> - <result column="registerTime" property="registerTime" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, code, userId, age, gender, name, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOrderAccountingMapper.xml b/optometry/src/main/resources/mapping/TOrderAccountingMapper.xml deleted file mode 100644 index 3d016e3..0000000 --- a/optometry/src/main/resources/mapping/TOrderAccountingMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOrderAccountingMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOrderAccounting"> - <id column="id" property="id" /> - <result column="code" property="code" /> - <result column="orderId" property="orderId" /> - <result column="rLens" property="rLens" /> - <result column="lLens" property="lLens" /> - <result column="frame" property="frame" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="commission" property="commission" /> - <result column="rLensProfit" property="rLensProfit" /> - <result column="lLensProfit" property="lLensProfit" /> - <result column="frameProfit" property="frameProfit" /> - <result column="payMoney" property="payMoney" /> - <result column="profitMoney" property="profitMoney" /> - <result column="profitRating" property="profitRating" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, code, orderId, rLens, lLens, frame, createTime, updateTime, createBy, updateBy, isDelete, commission, rLensProfit, lLensProfit, frameProfit, payMoney, profitMoney, profitRating - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOrderAftersalesMapper.xml b/optometry/src/main/resources/mapping/TOrderAftersalesMapper.xml deleted file mode 100644 index ccaaa83..0000000 --- a/optometry/src/main/resources/mapping/TOrderAftersalesMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOrderAftersalesMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOrderAftersales"> - <id column="id" property="id" /> - <result column="code" property="code" /> - <result column="sysId" property="sysId" /> - <result column="optometristId" property="optometristId" /> - <result column="orderId" property="orderId" /> - <result column="reason" property="reason" /> - <result column="handleResult" property="handleResult" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, code, sysId, optometristId, orderId, reason, handleResult, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TOrderMapper.xml b/optometry/src/main/resources/mapping/TOrderMapper.xml deleted file mode 100644 index d034eef..0000000 --- a/optometry/src/main/resources/mapping/TOrderMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TOrderMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TOrder"> - <id column="id" property="id" /> - <result column="code" property="code" /> - <result column="userId" property="userId" /> - <result column="optometryId" property="optometryId" /> - <result column="storeId" property="storeId" /> - <result column="modelId" property="modelId" /> - <result column="color" property="color" /> - <result column="series" property="series" /> - <result column="rLens" property="rLens" /> - <result column="lLens" property="lLens" /> - <result column="type" property="type" /> - <result column="refractiveIndex" property="refractiveIndex" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="sysId" property="sysId" /> - <result column="couponId" property="couponId" /> - <result column="itemsId" property="itemsId" /> - <result column="remark" property="remark" /> - <result column="isMail" property="isMail" /> - <result column="mailName" property="mailName" /> - <result column="mailPhone" property="mailPhone" /> - <result column="mailAddress" property="mailAddress" /> - <result column="orderMoney" property="orderMoney" /> - <result column="couponMoney" property="couponMoney" /> - <result column="payMoney" property="payMoney" /> - <result column="isMachining" property="isMachining" /> - <result column="machiningCode" property="machiningCode" /> - <result column="isAccounting" property="isAccounting" /> - <result column="accountingName" property="accountingName" /> - <result column="accountingTime" property="accountingTime" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, type, refractiveIndex, createTime, updateTime, createBy, updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName, mailPhone, mailAddress, orderMoney, couponMoney, payMoney, isMachining, machiningCode, isAccounting, accountingName, accountingTime - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TStoreMapper.xml b/optometry/src/main/resources/mapping/TStoreMapper.xml deleted file mode 100644 index 20a7319..0000000 --- a/optometry/src/main/resources/mapping/TStoreMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TStoreMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TStore"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="province" property="province" /> - <result column="provinceCode" property="provinceCode" /> - <result column="city" property="city" /> - <result column="cityCode" property="cityCode" /> - <result column="area" property="area" /> - <result column="areaCode" property="areaCode" /> - <result column="address" property="address" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="lon" property="lon" /> - <result column="lat" property="lat" /> - <result column="img" property="img" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, province, provinceCode, city, cityCode, area, areaCode, address, createTime, updateTime, createBy, updateBy, isDelete, lon, lat, img - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TSupplierMapper.xml b/optometry/src/main/resources/mapping/TSupplierMapper.xml deleted file mode 100644 index 17d5315..0000000 --- a/optometry/src/main/resources/mapping/TSupplierMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TSupplierMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TSupplier"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="status" property="status" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, status, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TTicketMapper.xml b/optometry/src/main/resources/mapping/TTicketMapper.xml deleted file mode 100644 index c5a85fe..0000000 --- a/optometry/src/main/resources/mapping/TTicketMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TTicketMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TTicket"> - <id column="id" property="id" /> - <result column="name" property="name" /> - <result column="type" property="type" /> - <result column="storeId" property="storeId" /> - <result column="cloudId" property="cloudId" /> - <result column="secret" property="secret" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, name, type, storeId, cloudId, secret, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TUserMapper.xml b/optometry/src/main/resources/mapping/TUserMapper.xml deleted file mode 100644 index ac843e1..0000000 --- a/optometry/src/main/resources/mapping/TUserMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TUserMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.common.model.TUser"> - <id column="id" property="id" /> - <result column="nickName" property="nickName" /> - <result column="userName" property="userName" /> - <result column="userPhone" property="userPhone" /> - <result column="password" property="password" /> - <result column="vipType" property="vipType" /> - <result column="insertTime" property="insertTime" /> - <result column="graduationInstitution" property="graduationInstitution" /> - <result column="selfIntroduction" property="selfIntroduction" /> - <result column="firstVipTime" property="firstVipTime" /> - <result column="startTime" property="startTime" /> - <result column="endTime" property="endTime" /> - <result column="consumptionAmount" property="consumptionAmount" /> - <result column="vipLevel" property="vipLevel" /> - <result column="sex" property="sex" /> - <result column="birthday" property="birthday" /> - <result column="weight" property="weight" /> - <result column="height" property="height" /> - <result column="provinceName" property="provinceName" /> - <result column="provinceCode" property="provinceCode" /> - <result column="cityName" property="cityName" /> - <result column="cityCode" property="cityCode" /> - <result column="performerCover" property="performerCover" /> - <result column="detailPicture" property="detailPicture" /> - <result column="openId" property="openId" /> - <result column="status" property="status" /> - <result column="auditStatus" property="auditStatus" /> - <result column="auditRemark" property="auditRemark" /> - <result column="lastLoginTime" property="lastLoginTime" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - <result column="hot" property="hot" /> - <result column="performerStatus" property="performerStatus" /> - <result column="vedio" property="vedio" /> - <result column="hasPay" property="hasPay" /> - <result column="advatar" property="advatar" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, nickName, userName, userPhone, password, vipType, insertTime, graduationInstitution, selfIntroduction, firstVipTime, startTime, endTime, consumptionAmount, vipLevel, sex, birthday, weight, height, provinceName, provinceCode, cityName, cityCode, performerCover, detailPicture, openId, status, auditStatus, auditRemark, lastLoginTime, createTime, updateTime, createBy, updateBy, isDelete, hot, performerStatus, vedio, hasPay, advatar - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mapping/TWarehousingMapper.xml b/optometry/src/main/resources/mapping/TWarehousingMapper.xml deleted file mode 100644 index 2e7ce17..0000000 --- a/optometry/src/main/resources/mapping/TWarehousingMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.jilongda.optometry.mapper.TWarehousingMapper"> - - <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.jilongda.optometry.model.TWarehousing"> - <id column="id" property="id" /> - <result column="status" property="status" /> - <result column="type" property="type" /> - <result column="storeId" property="storeId" /> - <result column="remark" property="remark" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> - </resultMap> - - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - id, status, type, storeId, remark, createTime, updateTime, createBy, updateBy, isDelete - </sql> - -</mapper> diff --git a/optometry/src/main/resources/mybatis-config.xml b/optometry/src/main/resources/mybatis-config.xml deleted file mode 100644 index 7a7c54a..0000000 --- a/optometry/src/main/resources/mybatis-config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd"> -<configuration> - - <settings> - <!-- 打印查询语句 不会写入到日志文件中--> - <setting name="logImpl" value="STDOUT_LOGGING"/> - <!--<setting name="logImpl" value="LOG4J" />--> - <!-- 控制全局缓存(二级缓存),按美团技术团队的说法,尽量别用缓存机制 emmmm.... --> - <setting name="cacheEnabled" value="true"/> - <!-- 延迟加载的全局开关。当开启时,所有关联对象都会延迟加载。默认 false --> - <!-- <setting name="lazyLoadingEnabled" value="true"/> --> - <!--<setting name="mapUnderscoreToCamelCase" value="false"/>--><!--是否将map下划线方式转为驼峰式命名--> - <!-- 当开启时,任何方法的调用都会加载该对象的所有属性。默认 false,可通过select标签的 fetchType来覆盖--> - <!-- <setting name="aggressiveLazyLoading" value="false"/>--> - <!-- Mybatis 创建具有延迟加载能力的对象所用到的代理工具,默认JAVASSIST --> - <!--<setting name="proxyFactory" value="CGLIB" />--> - <!-- 关于mybatis的一二级缓存 请参照:https://tech.meituan.com/2018/01/19/mybatis-cache.html --> - <!-- 一级缓存范围默认:SESSION ,此范围在复杂应用场景中可能会出现脏读数据--> - <!-- STATEMENT级别的缓存,使一级缓存,只针对当前执行的这一statement有效 --> - <!--<setting name="localCacheScope" value="STATEMENT"/>--> - <setting name="localCacheScope" value="STATEMENT"/> - </settings> - -</configuration> diff --git a/pom.xml b/pom.xml index 0365742..63d2368 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,6 @@ <module>common</module> <module>applet</module> <module>manage</module> - <module>optometry</module> </modules> <parent> <groupId>org.springframework.boot</groupId> -- Gitblit v1.7.1