Merge remote-tracking branch 'origin/master'

xuhy

2025-11-06 10a7efd801a520a0693c36355c5a1831d7d47345

Merge remote-tracking branch 'origin/master'

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmploymentController.java

New file
@@ -0,0 +1,71 @@
package com.ruoyi.web.controller.api;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.model.TEmploymentEntrepreneurship;
import com.ruoyi.system.model.TEmploymentInfo;
import com.ruoyi.system.service.TEmploymentEntrepreneurshipService;
import com.ruoyi.system.service.TEmploymentInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Slf4j
@RestController
@RequestMapping("/employment")
@Api(tags = "新就业模块")
public class EmploymentController {

    private final TEmploymentInfoService employmentInfoService;
    private final TEmploymentEntrepreneurshipService employmentEntrepreneurshipService;

    public EmploymentController(TEmploymentInfoService employmentInfoService, TEmploymentEntrepreneurshipService employmentEntrepreneurshipService) {
        this.employmentInfoService = employmentInfoService;
        this.employmentEntrepreneurshipService = employmentEntrepreneurshipService;
    }


    @PostMapping("/getEmploymentInfoList")
    @ApiOperation(value = "新就业模块--新就业信息列表",response =  TEmploymentInfo.class)
    public R<Page<TEmploymentInfo>> getEmploymentInfoList(@RequestBody BasePage basePage) {
        Page<TEmploymentInfo> page = new Page<>(basePage.getPageNum(), basePage.getPageSize());
        Page<TEmploymentInfo> pageEmploymentInfo = employmentInfoService.page(page, Wrappers.<TEmploymentInfo>lambdaQuery().orderByDesc(TEmploymentInfo::getCreateTime));
        return R.ok(pageEmploymentInfo);
    }


    @PostMapping("/getEmploymentInfoDetail/{id}")
    @ApiOperation(value = "新就业模块--新就业信息详情",response =  TEmploymentInfo.class)
    public R<TEmploymentInfo> getEmploymentInfoDetail(@PathVariable String id) {
        TEmploymentInfo employmentInfo = employmentInfoService.getById(id);
        employmentInfo.setReadCount(employmentInfo.getReadCount() + 1);
        employmentInfoService.updateById(employmentInfo);
        return R.ok(employmentInfo);
    }


    @PostMapping("/getEntrepreneurshipList")
    @ApiOperation(value = "创业模块--创业信息列表",response =  TEmploymentEntrepreneurship.class)
    public R<Page<TEmploymentEntrepreneurship>> getEntrepreneurshipList(@RequestBody BasePage basePage) {
        Page<TEmploymentEntrepreneurship> page = new Page<>(basePage.getPageNum(), basePage.getPageSize());
        Page<TEmploymentEntrepreneurship> tEmploymentEntrepreneurshipPage = employmentEntrepreneurshipService.page(page, Wrappers.<TEmploymentEntrepreneurship>lambdaQuery().orderByDesc(TEmploymentEntrepreneurship::getCreateTime));
        return R.ok(tEmploymentEntrepreneurshipPage);
    }


    @PostMapping("/getEntrepreneurshipDetail/{id}")
    @ApiOperation(value = "创业模块--创业信息详情",response =  TEmploymentEntrepreneurship.class)
    public R<TEmploymentEntrepreneurship> getEntrepreneurshipDetail(@PathVariable String id) {
        TEmploymentEntrepreneurship employmentEntrepreneurship = employmentEntrepreneurshipService.getById(id);
        employmentEntrepreneurship.setReadCount(employmentEntrepreneurship.getReadCount() + 1);
        employmentEntrepreneurshipService.updateById(employmentEntrepreneurship);
        return R.ok(employmentEntrepreneurship);
    }

}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

New file
@@ -0,0 +1,67 @@
package com.ruoyi.web.controller.api;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.IdDto;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.model.TNotice;
import com.ruoyi.system.service.TBannerService;
import com.ruoyi.system.service.TNoticeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Slf4j
@RestController
@RequestMapping("/index")
@Api(tags = "首页模块")
public class IndexController {

    private final TBannerService tBannerService;
    private final TNoticeService tNoticeService;

    public IndexController(TBannerService tBannerService, TNoticeService tNoticeService) {
        this.tBannerService = tBannerService;
        this.tNoticeService = tNoticeService;
    }



    @ApiOperation(value = "首页模块--轮播图",response = TBanner.class)
    @GetMapping(value = "/getBannerList")
    public R<List<TBanner>> getBannerList() {
        List<TBanner> tBannerList = tBannerService.list();
        return R.ok(tBannerList);
    }

    @ApiOperation(value = "首页模块--轮播图详情",response = TBanner.class)
    @GetMapping(value = "/getBannerDetail/{id}")
    public R<TBanner> getBannerDetail(@PathVariable String id) {
        TBanner tBanner = tBannerService.getById(id);
        return R.ok(tBanner);
    }


    @ApiOperation(value = "首页模块--公告活动",response = TNotice.class)
    @GetMapping(value = "/getNoticeList")
    public R<List<TNotice>> getNoticeList() {
        List<TNotice> tNoticeList = tNoticeService.list();
        return R.ok(tNoticeList);
    }




    @ApiOperation(value = "首页模块--公告活动详情",response = TNotice.class)
    @GetMapping(value = "/getNoticeDetail/{id}")
    public R<TNotice> getNoticeDetail(@PathVariable String id) {
        TNotice notice = tNoticeService.getById(id);
        return R.ok(notice);
    }


}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java

New file
@@ -0,0 +1,73 @@
package com.ruoyi.web.controller.api;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.model.TAdvertisement;
import com.ruoyi.system.model.TEmploymentInfo;
import com.ruoyi.system.model.TMerchant;
import com.ruoyi.system.model.TMerchantType;
import com.ruoyi.system.query.MerchantQuery;
import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

@Slf4j
@RestController
@RequestMapping("/merchant")
@Api(tags = "惠民商务模块")
public class MerchantController {

    private final TAdvertisementService advertisementService;
    private final TMerchantService merchantService;
    private final TMerchantTypeService merchantTypeService;

    public MerchantController(TAdvertisementService advertisementService, TMerchantService merchantService, TMerchantTypeService merchantTypeService) {
        this.advertisementService = advertisementService;
        this.merchantService = merchantService;
        this.merchantTypeService = merchantTypeService;
    }


    @GetMapping("/getAdvertisementList")
    @ApiOperation(value = "惠民商务--广告列表",response =  TAdvertisement.class)
    public R<List<TAdvertisement>> getAdvertisementList() {
        List<TAdvertisement> list = advertisementService.list();
        return R.ok(list);
    }

    @GetMapping("/getAdvertisementDetail/{id}")
    @ApiOperation(value = "惠民商务--广告详情",response =  TAdvertisement.class)
    public R<TAdvertisement> getAdvertisementList(@PathVariable String id) {
        TAdvertisement advertisement = advertisementService.getById(id);
        return R.ok(advertisement);
    }


    @PostMapping("/getMerchantList")
    @ApiOperation(value = "惠民商务--商户列表",response =  TMerchant.class)
    public R<Page<TMerchant>> getMerchantList(@RequestBody MerchantQuery query) {
        Page<TMerchant> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TMerchant> merchantPage = merchantService.page(page, Wrappers.<TMerchant>lambdaQuery().eq(Objects.nonNull(query.getTypeId()), TMerchant::getTypeId, query.getTypeId())
                .like(Objects.nonNull(query.getMerchantName()), TMerchant::getMerchantName, query.getMerchantName())
                .orderByDesc(BaseModel::getCreateTime)
        );
        return R.ok(merchantPage);
    }

    @GetMapping("/getMerchantDetail/{id}")
    @ApiOperation(value = "惠民商务--商户详情",response =  TMerchant.class)
    public R<TMerchant> getMerchantDetail(@PathVariable String id) {
        TMerchant merchant = merchantService.getById(id);
        return R.ok(merchant);
    }


}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PartyBuildingController.java

New file
@@ -0,0 +1,52 @@
package com.ruoyi.web.controller.api;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.IdDto;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.model.TPartyBuilding;
import com.ruoyi.system.query.PartyBuildingListQuery;
import com.ruoyi.system.service.TPartyBuildingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Slf4j
@RestController
@RequestMapping("/partyBuilding")
@Api(tags = "党建引领")
public class PartyBuildingController {

    private final TPartyBuildingService partyBuildingService;

    public PartyBuildingController(TPartyBuildingService partyBuildingService) {
        this.partyBuildingService = partyBuildingService;
    }

    @ApiOperation(value = "党建引领--列表",response = TPartyBuilding.class)
    @PostMapping(value = "/getPartyBuildingList")
    public R<Page<TPartyBuilding>> getPartyBuildingList(@RequestBody PartyBuildingListQuery query) {
        Page<TPartyBuilding> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TPartyBuilding> pageTPartyBuilding = partyBuildingService.page(page,
                Wrappers.<TPartyBuilding>lambdaQuery()
                        .eq(TPartyBuilding::getPartyType, query.getPartyType())
                        .orderByDesc(TPartyBuilding::getCreateTime));

        return R.ok(pageTPartyBuilding);
    }

    @ApiOperation(value = "党建引领--详情",response = TPartyBuilding.class)
    @PostMapping(value = "/getPartyBuildingDetail/{id}")
    public R<TPartyBuilding> getPartyBuildingDetail(@PathVariable String id) {
        TPartyBuilding partyBuilding = partyBuildingService.getById(id);
        partyBuilding.setReadCount(partyBuilding.getReadCount() + 1);
        partyBuildingService.updateById(partyBuilding);
        return R.ok(partyBuilding);
    }

}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java

New file
@@ -0,0 +1,116 @@
package com.ruoyi.web.controller.api;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TAppealServices;
import com.ruoyi.system.model.TChildcareServices;
import com.ruoyi.system.model.TMicroWish;
import com.ruoyi.system.query.AppealServicesStatusQuery;
import com.ruoyi.system.query.MicroWishStatusQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TAppealServicesService;
import com.ruoyi.system.service.TChildcareServicesService;
import com.ruoyi.system.service.TMicroWishService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.Objects;

@Slf4j
@RestController
@RequestMapping("/userIndex")
@Api(tags = "个人中心")
public class UserIndexController {

    private final TAppUserService tAppUserService;
    private final TChildcareServicesService tChildcareServicesService;
    private final TAppealServicesService tAppealServicesService;
    private final TMicroWishService tMicroWishService;
    private final TokenService tokenService;


    public UserIndexController(TAppUserService tAppUserService, TChildcareServicesService tChildcareServicesService, TAppealServicesService tAppealServicesService, TMicroWishService tMicroWishService, TokenService tokenService) {
        this.tAppUserService = tAppUserService;
        this.tChildcareServicesService = tChildcareServicesService;
        this.tAppealServicesService = tAppealServicesService;
        this.tMicroWishService = tMicroWishService;
        this.tokenService = tokenService;
    }


    @ApiOperation(value = "个人中心--用户信息",response = TAppUser.class)
    @GetMapping(value = "/getUserInfo")
    public R<TAppUser> getUserInfo() {
        String userId = tokenService.getLoginUserApplet().getUserId();
        return R.ok(tAppUserService.getById(userId));
    }


    @ApiOperation(value = "个人中心--托育服务记录",response = TChildcareServices.class)
    @PostMapping(value = "/getChildcareServicesList")
    public R<Page<TChildcareServices>> getChildcareServicesList(@RequestBody BasePage basePage) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TChildcareServices> page = new Page<>(basePage.getPageNum(), basePage.getPageSize());
        Page<TChildcareServices> childcareServicesPage = tChildcareServicesService.page(page, Wrappers.<TChildcareServices>lambdaQuery().eq(TChildcareServices::getAppUserId, userId).orderByDesc(BaseModel::getCreateTime));
        return R.ok(childcareServicesPage);
    }

    @ApiOperation(value = "个人中心--托育服务记录详情",response = TChildcareServices.class)
    @GetMapping(value = "/getChildcareServicesDetail/{id}")
    public R<TChildcareServices> getChildcareServicesList(@PathVariable String id) {
        TChildcareServices childcareServices = tChildcareServicesService.getById(id);
        return R.ok(childcareServices);
    }


    @ApiOperation(value = "个人中心--诉求服务记录",response = TAppealServices.class)
    @PostMapping(value = "/getAppealServicesList")
    public R<Page<TAppealServices>> getAppealServicesList(@RequestBody AppealServicesStatusQuery query) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TAppealServices> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TAppealServices> appealServicesPage = tAppealServicesService.page(page, Wrappers.<TAppealServices>lambdaQuery().eq(TAppealServices::getAppUserId, userId).eq(TAppealServices::getAppealType,1).eq(Objects.nonNull(query.getStatus()), TAppealServices::getStatus, query.getStatus()).orderByDesc(BaseModel::getCreateTime));
        return R.ok(appealServicesPage);
    }

    @ApiOperation(value = "个人中心--诉求服务记录/随手拍详情",response = TAppealServices.class)
    @GetMapping(value = "/getAppealServicesDetail/{id}")
    public R<TAppealServices> getAppealServicesList(@PathVariable String id) {
        TAppealServices appealServices = tAppealServicesService.getById(id);
        return R.ok(appealServices);
    }


    @ApiOperation(value = "个人中心--随手拍记录",response = TAppealServices.class)
    @PostMapping(value = "/getSnapShareList")
    public R<Page<TAppealServices>> getSnapShareList(@RequestBody AppealServicesStatusQuery query) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TAppealServices> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TAppealServices> appealServicesPage = tAppealServicesService.page(page, Wrappers.<TAppealServices>lambdaQuery().eq(TAppealServices::getAppUserId, userId).eq(TAppealServices::getAppealType,2).eq(Objects.nonNull(query.getStatus()), TAppealServices::getStatus, query.getStatus()).orderByDesc(BaseModel::getCreateTime));
        return R.ok(appealServicesPage);
    }

    @ApiOperation(value = "个人中心--微心愿记录",response = TMicroWish.class)
    @PostMapping(value = "/getMicroWishList")
    public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishStatusQuery query) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TMicroWish> microWishPage = tMicroWishService.page(page, Wrappers.<TMicroWish>lambdaQuery().eq(TMicroWish::getAppUserId, userId).eq(Objects.nonNull(query.getStatus()), TMicroWish::getStatus, query.getStatus()).orderByDesc(BaseModel::getCreateTime));
        return R.ok(microWishPage);
    }

    @ApiOperation(value = "个人中心--微心愿详情",response = TMicroWish.class)
    @GetMapping(value = "/getMicroWishDetail/{id}")
    public R<TMicroWish> getMicroWishDetail(@PathVariable String id) {
        TMicroWish microWish = tMicroWishService.getById(id);
        return R.ok(microWish);
    }


}

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -117,9 +117,11 @@
                        "/register","/applet/getCode","/applet/loginCode",
                        "/applet/changepwd", "/captchaImage","/getCode","/loginCode",
                        "/operations/getBySingleNum/**",
                        "/user/getUserInfoByNumber/**","/open/t-app-user/test",
                        "/wxLogin/**","/cos/get/**","/t-mission/**","/api/t-app-user/**","/open/file/**","/open/t-data-statistics/**","/open/pushMessageSolo/**",
                        "/open/t-mission/sendMission","/open/websocket/**"
                        "/user/getUserInfoByNumber/**",

                        "/index/**",
                        "/employment/**",
                        "/partyBuilding/**"
                ).permitAll()
                // 静态资源，可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

 ruoyi-system/src/main/java/com/ruoyi/system/dto/IdDto.java

New file
@@ -0,0 +1,12 @@
package com.ruoyi.system.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel("idDto")
public class IdDto implements Serializable {
    private String id;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/AppealServicesStatusQuery.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("服务/随手拍状态query")
public class AppealServicesStatusQuery extends BasePage {
    @ApiModelProperty(value = "状态 1=待处理 2=已处理" )
    private Integer status;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/MerchantQuery.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("惠民商务Query")
public class MerchantQuery extends BasePage {
    @ApiModelProperty("分类id")
    private String typeId;

    @ApiModelProperty("商户名称")
    private String merchantName;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/MicroWishStatusQuery.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("微心愿状态query")
public class MicroWishStatusQuery extends BasePage {
    @ApiModelProperty(value = "状态 1=待审核 2=已公开 3=已驳回 4=待处理 5=已处理" )
    private Integer status;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/PartyBuildingListQuery.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel("党建引领query")
public class PartyBuildingListQuery extends BasePage implements Serializable {
    @ApiModelProperty(value = "分类 1=党务公开 2=党建风采 3=党建学习")
    private Integer partyType;
}