Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitan...

张天森

2022-09-14 79d022f98239e5f029bdca3adf38ca4a39e15143

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoIndustryCenterApi.java

@@ -7,14 +7,13 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.service.ComSanShuoIndustryCenterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 三说会堂业务中心管理控制器
 * */
 */
@RestController
@RequestMapping("/sanshuo/industryCenter")
public class ComSanShuoIndustryCenterApi extends BaseController {
@@ -24,44 +23,44 @@
    private UserService userService;

    @GetMapping("/list")
    public R list(@RequestParam(value = "keyWord",required = false)String keyWord,
                  @RequestParam(value = "page",required = false)Integer page,
                  @RequestParam(value = "size",required = false)Integer size){
        return R.ok(comSanShuoIndustryCenterService.pageIndustryCenter(keyWord,page,size));
    public R list(@RequestParam(value = "keyWord", required = false) String keyWord,
                  @RequestParam(value = "page", required = false) Integer page,
                  @RequestParam(value = "size", required = false) Integer size) {
        return R.ok(comSanShuoIndustryCenterService.pageIndustryCenter(keyWord, page, size));
    }

    @GetMapping("/appletsList")
    public R appletsList(){
        return R.ok(comSanShuoIndustryCenterService.list(new QueryWrapper<ComSanshuoIndustryCenter>().eq("status",1).eq("del_flag",1)));
    public R appletsList() {
        return R.ok(comSanShuoIndustryCenterService.list(new QueryWrapper<ComSanshuoIndustryCenter>().eq("status", 1).eq("del_flag", 1)));
    }

    @GetMapping("/detail")
    public R detail(@RequestParam Long id){
    public R detail(@RequestParam Long id) {
        return R.ok(comSanShuoIndustryCenterService.getById(id));
    }

    /**
     * 添加业务中心
     * */
     */
    @PostMapping
    public R add(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
    public R add(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO) {
        comSanShuoIndustryCenterDTO.setCreateBy(this.getLoginUserInfo().getName());
        return comSanShuoIndustryCenterService.addOrUpdate(comSanShuoIndustryCenterDTO);
    }

    /**
     * 修改业务中心
     * */
     */
    @PutMapping
    public R update(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
    public R update(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO) {
        return comSanShuoIndustryCenterService.addOrUpdate(comSanShuoIndustryCenterDTO);
    }

    /**
     * 删除业务中心
     * */
     */
    @DeleteMapping("/remove")
    public R remove(@RequestParam("id") Long id){
    public R remove(@RequestParam("id") Long id) {
        ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(id);
        center.setDelFlag(0);
        center.setStatus(0);
@@ -70,9 +69,9 @@

    /**
     * 重置密码
     * */
     */
    @PostMapping("/resetPass")
    public R resetPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
    public R resetPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO) {
        ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comSanShuoIndustryCenterDTO.getId());
        center.setPassword(comSanShuoIndustryCenterDTO.getPassword());
        return R.ok(comSanShuoIndustryCenterService.resetPassword(center));