diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 67f246a..d6b9fdc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -78,6 +78,9 @@ public class ShiroConfig { } } } + + filterChainDefinitionMap.put("/web/user/login/**","anon");//前台页面登录 + filterChainDefinitionMap.put("/mini/user/phoneLogin","anon");//小程序手机号登录 filterChainDefinitionMap.put("/mini/user/login","anon");//小程序登录 filterChainDefinitionMap.put("/mini/article/**","anon");//小程序-文章 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java index c1e17c2..b597292 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java @@ -2,27 +2,20 @@ package org.jeecg.modules.mini.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; -import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; -import org.jeecg.modules.yx.entity.YxMajor; -import org.jeecg.modules.yx.entity.YxSchoolExamMajor; -import org.jeecg.modules.yx.entity.YxSchoolMajor; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.*; -import java.util.stream.Collectors; /** * @Description 小程序端-专业接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java index 689ae21..3025d56 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.service.MiniSchoolService; import org.jeecg.modules.yx.entity.YxSchoolDoubleFirstPlan; import org.jeecg.modules.yx.entity.YxSubjectEvaluation; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java index aa28eec..43ab257 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java @@ -10,14 +10,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.SchoolGraduateDegreeDTO; import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; import org.jeecg.modules.yx.service.IYxSchoolGraduateDegreeService; import org.jeecg.modules.yx.service.IYxSchoolResearchTeachingService; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java index 6e2fd97..fa2c7b0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java @@ -180,25 +180,27 @@ public class MiniUserController { @ApiOperation(value = "微信小程序手机号登录") public Result wechatLogin(@NotNull @RequestBody WxModel wxModel) { SysUser user = null; - if (false) { - user = sysUserService.getUserByPhone("15090658223"); - } else { - String url = "https://api.weixin.qq.com/sns/jscode2session" + - "?appid=" + wxAppId + - "&secret=" + wxAppSecret + - "&grant_type=authorization_code" + - "&js_code=" + wxModel.code; - String s = HttpUtil.get(url); - JSONObject jsonObject = JSONObject.parseObject(s); - AssertUtils.notNull(jsonObject, "登录失败"); - String openId = jsonObject.getString("openid"); - String sessionKey = jsonObject.getString("session_key"); - user = sysUserService.getByWxOpenId(openId); + String url = "https://api.weixin.qq.com/sns/jscode2session" + + "?appid=" + wxAppId + + "&secret=" + wxAppSecret + + "&grant_type=authorization_code" + + "&js_code=" + wxModel.code; + String s = HttpUtil.get(url); + JSONObject jsonObject = JSONObject.parseObject(s); + AssertUtils.notNull(jsonObject, "登录失败"); + String wxOpenId = jsonObject.getString("openid"); + String sessionKey = jsonObject.getString("session_key"); + user = sysUserService.getByWxOpenId(wxOpenId); + if (user == null) { + //判断 用户的手机号有没有注册 + String phone = phoneDecrypt(wxModel.getEncryptedData(), sessionKey, wxModel.getIv()); + user = sysUserService.getUserByPhone(phone); if (user == null) { + //如果手机号也没有，那就说明这个是新用户 String salt = oConvertUtils.randomGen(8); //新用户 user = new SysUser(); - user.setWxOpenId(openId); + user.setWxOpenId(wxOpenId); user.setUsername(salt); user.setRealname("用户+" + salt); user.setSalt(salt); @@ -206,11 +208,15 @@ public class MiniUserController { user.setPassword(encryptPassword); user.setStatus(1); //解密手机号 - user.setPhone(phoneDecrypt(wxModel.getEncryptedData(), sessionKey, wxModel.getIv())); + user.setPhone(phone); user.setUserIdentity(CommonConstant.USER_IDENTITY_1); user.setDelFlag(CommonConstant.DEL_FLAG_0); user.setOrgCode(null); sysUserService.saveUser(user, null, null, null); + }else{ + //该手机号已经注册，直接覆盖微信openId + user.setWxOpenId(wxOpenId); + sysUserService.updateById(user); } } String username = user.getUsername(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java index 7eebb76..d6c85d5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java @@ -9,9 +9,9 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.UserScoreDto; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java index 09cf537..1633add 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java @@ -2,21 +2,15 @@ package org.jeecg.modules.mini.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; -import java.util.List; import java.util.Set; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java index d7fdae7..bd40226 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java @@ -2,9 +2,7 @@ package org.jeecg.modules.mini.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; @@ -15,7 +13,6 @@ import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import org.jeecg.modules.yx.service.IYxSchoolMajorService; import org.jeecg.modules.yx.service.IYxUserScoreService; import org.jeecg.modules.yx.service.impl.*; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java index 01dfeae..e565be6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java @@ -51,5 +51,5 @@ public class SysLoginModel { public void setCheckKey(String checkKey) { this.checkKey = checkKey; } - -} \ No newline at end of file + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtMajorController.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtMajorController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtMajorController.java index 5c4a4fd..f313545 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtMajorController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.controller; +package org.jeecg.modules.web.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.entity.YxUserScore; import org.jeecg.modules.yx.service.IYxMajorService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java similarity index 95% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java index 0f5ea9d..870e9fd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java @@ -1,9 +1,6 @@ -package org.jeecg.modules.art.controller; +package org.jeecg.modules.web.controller; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; @@ -13,26 +10,22 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtCalculateInvestmentDTO; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; -import org.jeecg.modules.art.vo.QueryCalculateInvestmentVO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtCalculateInvestmentDTO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.vo.QueryCalculateInvestmentVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.service.MiniTestCulturalService; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.service.*; import org.jeecg.modules.yx.util.ScoreUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; -import java.util.stream.Collectors; /** * @Description 艺术类接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtSchoolController.java similarity index 87% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtSchoolController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtSchoolController.java index 1de6984..3c22f8a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtSchoolController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtSchoolController.java @@ -1,12 +1,10 @@ -package org.jeecg.modules.art.controller; +package org.jeecg.modules.web.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.art.dto.ArtSchoolDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.service.IYxSchoolService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java index f1035e7..11400ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java @@ -1,10 +1,7 @@ -package org.jeecg.modules.art.controller; +package org.jeecg.modules.web.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -13,11 +10,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; -import org.jeecg.modules.art.vo.SaveVolunteerVO; +import org.jeecg.modules.web.vo.SaveVolunteerVO; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.yx.dto.VolunteerDTO; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java new file mode 100644 index 0000000..716e99a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.web.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.system.model.SysLoginModel; +import org.jeecg.modules.web.service.WebUserService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author ZhouWenTao + * @create 2024-04-17-15:22 + */ +@RequestMapping("/web/user") +@RestController +@Api(tags = "前台用户接口") +@Slf4j +public class WebUserController { + @Resource + private WebUserService webUserService; + @RequestMapping(value = "/login/passwd", method = RequestMethod.POST) + @ApiOperation(value = "手机号密码登录") + public Result loginPasswd(@RequestBody SysLoginModel sysLoginModel){ + return webUserService.loginPasswd(sysLoginModel); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtBaseDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtBaseDTO.java similarity index 90% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtBaseDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtBaseDTO.java index 1684758..427cf54 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtBaseDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtBaseDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import lombok.Data; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtCalculateInvestmentDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtCalculateInvestmentDTO.java similarity index 95% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtCalculateInvestmentDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtCalculateInvestmentDTO.java index 078b1c8..db8c8d4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtCalculateInvestmentDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtCalculateInvestmentDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtHotSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtHotSchoolDTO.java similarity index 87% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtHotSchoolDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtHotSchoolDTO.java index f246619..c397be7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtHotSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtHotSchoolDTO.java @@ -1,7 +1,6 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import lombok.Data; -import org.jeecg.modules.yx.entity.YxSchool; import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtMiniMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtMiniMajorDTO.java similarity index 90% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtMiniMajorDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtMiniMajorDTO.java index e506db9..28bdadb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtMiniMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtMiniMajorDTO.java @@ -1,9 +1,8 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.yx.entity.YxMajor; import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtRecommendMajorBaseDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java similarity index 95% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtRecommendMajorBaseDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java index ad9eeb9..3bb43e4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtRecommendMajorBaseDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtSchoolDTO.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtSchoolDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtSchoolDTO.java index ba7c752..c6d4262 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtSchoolDTO.java @@ -1,9 +1,7 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; -import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; @@ -14,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; -import java.util.List; import java.util.Set; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtTestCulturalDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtTestCulturalDTO.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtTestCulturalDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtTestCulturalDTO.java index 4550832..df82e82 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/ArtTestCulturalDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtTestCulturalDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/MiniMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/MiniMajorDTO.java similarity index 78% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/MiniMajorDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/MiniMajorDTO.java index 4e4510e..11f7ff9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/MiniMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/MiniMajorDTO.java @@ -1,14 +1,10 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.yx.entity.YxMajor; -import java.io.Serializable; -import java.util.List; - /** * @Description * @Author ZhouWenTao diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java similarity index 95% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java index 9ecd0da..9cc23de 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java @@ -1,14 +1,10 @@ -package org.jeecg.modules.art.dto; +package org.jeecg.modules.web.dto; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; -import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.math.BigDecimal; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java new file mode 100644 index 0000000..063d31c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java @@ -0,0 +1,77 @@ +package org.jeecg.modules.web.service; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.AssertUtils; +import org.jeecg.common.util.PasswordUtil; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.mini.dto.VipDTO; +import org.jeecg.modules.mini.service.MiniUserService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.model.SysLoginModel; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 前台用户service + * + * @author ZhouWenTao + * @create 2024-04-17-15:30 + */ +@Service +@Slf4j +public class WebUserService { + @Resource + private ISysUserService sysUserService; + @Resource + private MiniUserService miniUserService; + @Resource + private RedisUtil redisUtil; + + /** + * 根据手机号及密码登录 + */ + public Result loginPasswd(SysLoginModel sysLoginModel) { + try { + String username = sysLoginModel.getUsername(); + String password = sysLoginModel.getPassword(); + AssertUtils.notNull(username, "手机号不可为空"); + AssertUtils.notNull(username, "密码不可为空"); + SysUser sysUser = sysUserService.getUserByPhone(username); + AssertUtils.notNull(sysUser,"手机号或密码错误"); + //2. 校验用户名或密码是否正确 + String userpassword = PasswordUtil.encrypt(sysUser.getUsername(), password, sysUser.getSalt()); + String syspassword = sysUser.getPassword(); + AssertUtils.isTrue(syspassword.equals(userpassword), "手机号或密码错误"); + //用户登录信息 + //生成token + String token = JwtUtil.sign(sysUser.getUsername(), syspassword); + // 设置token缓存有效时间 + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 3600 * 2); + JSONObject obj = new JSONObject(); + LoginUser loginUser = new LoginUser(); + BeanUtils.copyProperties(sysUser, loginUser); + //获取vip信息 + VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId()); + if (vipDTO != null) { + obj.put("vipInfo", vipDTO); + } else { + obj.put("vipInfo", null); + } + obj.put("token", token); + obj.put("userInfo", loginUser); + return Result.OK(obj); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryCalculateInvestmentVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryCalculateInvestmentVO.java similarity index 95% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryCalculateInvestmentVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryCalculateInvestmentVO.java index 279dabf..65e767f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryCalculateInvestmentVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryCalculateInvestmentVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryConversionScoreBatchVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryConversionScoreBatchVO.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryConversionScoreBatchVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryConversionScoreBatchVO.java index 8ae1c87..2ab91b3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryConversionScoreBatchVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryConversionScoreBatchVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryRecommendMajorVO.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryRecommendMajorVO.java index 62a7115..feca125 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryRecommendMajorVO.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.art.dto.ArtBaseDTO; +import org.jeecg.modules.web.dto.ArtBaseDTO; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QuerySchoolVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QuerySchoolVO.java similarity index 89% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QuerySchoolVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QuerySchoolVO.java index 0cfd7fa..6a9bdeb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QuerySchoolVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QuerySchoolVO.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.art.dto.ArtBaseDTO; +import org.jeecg.modules.web.dto.ArtBaseDTO; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerRecordVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerRecordVO.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerRecordVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerRecordVO.java index 4c352d4..e855c9b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerRecordVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerRecordVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerVO.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerVO.java index d5d48d4..b374144 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/SaveVolunteerVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.art.vo; +package org.jeecg.modules.web.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreBatchController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreBatchController.java index acd8821..b78e6f2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreBatchController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreBatchController.java @@ -2,24 +2,14 @@ package org.jeecg.modules.yx.controller; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.art.vo.QueryConversionScoreBatchVO; -import org.jeecg.modules.yx.constant.YxConstant; +import org.jeecg.modules.web.vo.QueryConversionScoreBatchVO; import org.jeecg.modules.yx.entity.YxHistoryScoreBatch; -import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; import org.jeecg.modules.yx.service.IYxHistoryScoreBatchService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -27,19 +17,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.yx.util.ScoreUtil; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java index 354c3cd..8025f3c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java @@ -2,22 +2,17 @@ package org.jeecg.modules.yx.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.gson.JsonObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.UserScoreDto; import org.jeecg.modules.yx.entity.*; @@ -31,7 +26,6 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * @Description diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/UserScoreDto.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/UserScoreDto.java index 8ac48e3..24cca09 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/UserScoreDto.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/UserScoreDto.java @@ -3,7 +3,7 @@ package org.jeecg.modules.yx.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.yx.entity.YxUserScore; import org.jeecg.modules.yx.entity.YxVolunteer; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java index 827a769..af404cc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java @@ -1,18 +1,11 @@ package org.jeecg.modules.yx.dto; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecgframework.poi.excel.annotation.Excel; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - /** * @Description * @Author ZhouWenTao diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java index d7e93ef..667c831 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java @@ -2,11 +2,9 @@ package org.jeecg.modules.yx.mapper; import java.util.List; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxCalculationMajor; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMajorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMajorMapper.java index 26c924e..d73c352 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMajorMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMajorMapper.java @@ -5,8 +5,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.dto.YxSchoolMajorDTO; import org.jeecg.modules.yx.entity.YxSchoolMajor; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java index 606310d..c847eab 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java @@ -5,8 +5,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.art.dto.ArtSchoolDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtSchoolDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.YxSchool; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml index 318fcd9..118484c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml @@ -18,7 +18,7 @@ - SELECT s.school_name, s.school_icon, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index cdd505a..c9a3b15 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml @@ -2,7 +2,7 @@ - SELECT s.id as schoolId, s.school_name, @@ -165,7 +165,7 @@ - SELECT sc.school_name, sm.school_code, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml index ea45825..d03eb79 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml @@ -2,7 +2,7 @@ - SELECT s.id, sc.school_name, @@ -100,7 +100,7 @@ ORDER BY gzsz,sfsyl,is985,is211 DESC - SELECT s.id, sc.school_name, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxVolunteerRecordMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxVolunteerRecordMapper.xml index 8d031b9..ba6439c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxVolunteerRecordMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxVolunteerRecordMapper.xml @@ -13,7 +13,7 @@ - SELECT sc.school_name, sm.school_code, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java index bc48f1b..6b3b647 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxCalculationMajor; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.yx.entity.YxUserScore; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java index 6feac6c..27ada3c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxHistoryMajorEnrollService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxMajorService.java index e8c726d..3fa9285 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxMajorService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxMajorService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.art.dto.ArtMiniMajorDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtMiniMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxMajor; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMajorService.java index aa0de39..8ce8750 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMajorService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMajorService.java @@ -2,10 +2,9 @@ package org.jeecg.modules.yx.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.dto.YxSchoolMajorDTO; import org.jeecg.modules.yx.entity.YxSchoolMajor; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java index 08cdbe4..e558448 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java @@ -1,9 +1,9 @@ package org.jeecg.modules.yx.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.jeecg.modules.art.dto.ArtHotSchoolDTO; -import org.jeecg.modules.art.dto.ArtSchoolDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtHotSchoolDTO; +import org.jeecg.modules.web.dto.ArtSchoolDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.YxSchool; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerRecordService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerRecordService.java index 437929a..0df077c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerRecordService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerRecordService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.art.vo.SaveVolunteerVO; +import org.jeecg.modules.web.vo.SaveVolunteerVO; import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.entity.YxVolunteerRecord; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerService.java index c740a1e..35860cb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVolunteerService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.art.vo.SaveVolunteerVO; +import org.jeecg.modules.web.vo.SaveVolunteerVO; import org.jeecg.modules.yx.dto.VolunteerDTO; import org.jeecg.modules.yx.entity.YxVolunteer; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java index b1a54a1..ea84e41 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java index 4712241..54e249d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java @@ -1,11 +1,10 @@ package org.jeecg.modules.yx.service.impl; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java index 8435ffd..b910891 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java @@ -2,8 +2,8 @@ package org.jeecg.modules.yx.service.impl; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; @@ -12,8 +12,6 @@ import org.jeecg.modules.yx.entity.YxUserScore; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import org.jeecg.modules.yx.service.IYxScoreSegmentService; import org.jeecg.modules.yx.util.ScoreUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java index 3daf95c..8e9deac 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.yx.service.impl; import org.apache.commons.collections.CollectionUtils; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxUserScore; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java index 08295a5..dd31c8d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.ArtTestCulturalDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.ArtTestCulturalDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index e673689..c296128 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -1,21 +1,17 @@ package org.jeecg.modules.yx.service.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.mapper.YxCalculationMajorMapper; -import org.jeecg.modules.yx.mapper.YxHistoryMajorEnrollMapper; import org.jeecg.modules.yx.mapper.YxSchoolMajorMapper; import org.jeecg.modules.yx.mapper.YxSchoolMapper; import org.jeecg.modules.yx.service.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java index 6e04cfd..c25a28c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java @@ -3,8 +3,7 @@ package org.jeecg.modules.yx.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java index 4bd8f17..4459cd8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java @@ -1,23 +1,20 @@ package org.jeecg.modules.yx.service.impl; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtMiniMajorDTO; -import org.jeecg.modules.art.dto.MiniMajorDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; -import org.jeecg.modules.yx.entity.YxFirstLevelDisciplines; +import org.jeecg.modules.web.dto.ArtMiniMajorDTO; +import org.jeecg.modules.web.dto.MiniMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxMajor; import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.mapper.YxMajorMapper; -import org.jeecg.modules.yx.mapper.YxSchoolMapper; import org.jeecg.modules.yx.service.IYxFirstLevelDisciplinesService; import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import org.jeecg.modules.yx.service.IYxMajorService; @@ -30,7 +27,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Description: 专业信息表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java index 4e36a96..fdf6a5c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java @@ -1,6 +1,5 @@ package org.jeecg.modules.yx.service.impl; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,18 +8,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.checkerframework.checker.units.qual.A; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.LiNianShuJuZhuan2DTO; -import org.jeecg.modules.yx.dto.LiNianShuJuZhuanDTO; -import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.dto.YxSchoolMajorDTO; import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.mapper.YxSchoolMajorMapper; @@ -29,7 +22,6 @@ import org.jeecg.modules.yx.service.*; import org.jeecg.modules.yx.util.ScoreUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; -import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java index 36057c3..60b3a34 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java @@ -1,16 +1,14 @@ package org.jeecg.modules.yx.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.units.qual.A; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.art.dto.ArtHotSchoolDTO; -import org.jeecg.modules.art.dto.ArtSchoolDTO; -import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.web.dto.ArtHotSchoolDTO; +import org.jeecg.modules.web.dto.ArtSchoolDTO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.*; @@ -23,7 +21,6 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; -import java.lang.reflect.Array; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java index 6c63b1c..7dda2fc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java @@ -1,15 +1,13 @@ package org.jeecg.modules.yx.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.collections.CollectionUtils; import org.jeecg.common.util.AssertUtils; -import org.jeecg.modules.art.vo.SaveVolunteerVO; +import org.jeecg.modules.web.vo.SaveVolunteerVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.entity.YxVolunteerRecord; import org.jeecg.modules.yx.mapper.YxVolunteerRecordMapper; -import org.jeecg.modules.yx.service.IYxMajorService; import org.jeecg.modules.yx.service.IYxSchoolMajorService; import org.jeecg.modules.yx.service.IYxVolunteerRecordService; import org.springframework.beans.BeanUtils; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java index 46efaa5..fc0f0b9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java @@ -2,17 +2,15 @@ package org.jeecg.modules.yx.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.ApiModelProperty; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; -import org.jeecg.modules.art.dto.RecommendMajorDTO; -import org.jeecg.modules.art.vo.SaveVolunteerRecordVO; -import org.jeecg.modules.art.vo.SaveVolunteerVO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; +import org.jeecg.modules.web.vo.SaveVolunteerRecordVO; +import org.jeecg.modules.web.vo.SaveVolunteerVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.VolunteerDTO; import org.jeecg.modules.yx.dto.VolunteerRecordDTO; @@ -25,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/ZhuanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/ZhuanService.java index 4d5a436..f7aaf7d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/ZhuanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/ZhuanService.java @@ -2,11 +2,10 @@ package org.jeecg.modules.yx.service.impl; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; -import org.jeecg.modules.yx.entity.YxScoreSegment; import org.jeecg.modules.yx.entity.YxUserScore; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import org.jeecg.modules.yx.service.IYxScoreSegmentService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java index 829d3cf..c68ba42 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java @@ -2,7 +2,7 @@ package org.jeecg.modules.yx.util; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.art.dto.RecommendMajorDTO; +import org.jeecg.modules.web.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine;