合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java

@@ -3,26 +3,29 @@
import cn.hutool.crypto.SecureUtil;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.City;
import com.dsh.course.feignClient.account.CityClient;
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
import com.dsh.course.feignClient.competition.model.*;
import com.dsh.course.feignClient.course.CourseClient;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TCourse;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -61,6 +64,8 @@

    @Resource
    private UserMapper userMapper;
    @Autowired
    private IUserService userService;


    /**
@@ -108,6 +113,19 @@
        Page<TCityManager> competitions = cityClient.list(listQuery);
        return  super.packForBT(competitions);
    }


    @Resource
     private CourseClient courseClient;
    @RequestMapping(value = "/timeChange")
    @ResponseBody
    public List<SelectDto> timeChange(Integer oneId) {
        List<SelectDto> integerList = courseClient.timeChange(oneId);
        return integerList ;
    }





    @RequestMapping(value = "/add")
@@ -174,9 +192,13 @@
    @RequestMapping(value = "/onChange")
    @ResponseBody
    public Object onChange(Integer oneId) {
        if (oneId == null) {
            return null;
        }
        try {
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
            return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
            QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
            return cityService.list(query);
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
@@ -222,7 +244,14 @@
    @ResponseBody
    public Object pwd(Integer id) {
        try {
            userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getObjectId,id).eq(User::getObjectType,2));
            // 查询门店 获取门店店长id
            TStore store = storeService.getById(id);
            User user = userService.getById(store.getStoreStaffId());
            user.setPassword(SecureUtil.md5("a123456"));
            userService.updateById(user);
            userMapper.selectOne(new LambdaQueryWrapper<User>()
                    .eq(User::getObjectId,id)
                    .eq(User::getObjectType,2));
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
@@ -234,7 +263,7 @@
    public Object getPeopleFromId(Integer id,Integer state) {
        try {
            Page<Object> page = new PageFactory<>().defaultPage();
            Page<Participant> data =   competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            Page<CompetitionUser> data =   competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            return  super.packForBT(data);
        }catch (Exception e){
            e.printStackTrace();