update

张天森

2022-09-23 8704dd30b854eba5d60035763f0229da8fad5b6b

update

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java

@@ -107,4 +107,17 @@
        return communityService.detailCommunity(id);
    }

    @ApiOperation("删除社区")
    @DeleteMapping("/remove/{id}")
    public R removeCommunity(@PathVariable("id")Long id){
        return communityService.removeCommunity(id);
    }

    @ApiOperation("重置密码")
    @PostMapping("/repass")
    public R repass(@RequestBody ComActVO comActVO){
        return communityService.repassCommunity(comActVO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java

@@ -5,10 +5,7 @@
import javax.annotation.Resource;

import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
@@ -61,4 +58,22 @@
        return communityService.delectStreat(Ids);
    }

    @ApiOperation("修改街道")
    @PostMapping("/update")
    public R update(@RequestBody ComStreetVO comStreetVO){
        return communityService.updateStreet(comStreetVO);
    }

    @DeleteMapping("/remove/{id}")
    @ApiOperation("删除街道")
    public R remove(@PathVariable("id") Long id){
        return communityService.removeStreet(id);
    }

    @ApiOperation("重置密码")
    @PostMapping("repass")
    public R repass(@RequestBody ComStreetVO comStreetVO){
        return communityService.repassStreet(comStreetVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java

@@ -92,4 +92,7 @@

    @ApiModelProperty("行政区域")
    private String administrativeRegions;

    @ApiModelProperty("调解站电话")
    private String solvePhone;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java

@@ -57,4 +57,7 @@

    @ApiModelProperty("行政区域")
    private String administrativeRegions;

    @ApiModelProperty("调节站电话")
    private String solvePhone;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10500,4 +10500,28 @@
     * */
    @GetMapping("/sanshuo/expert/expertShowList")
    R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);

    /**
     * 修改街道信息
     * */
    @PostMapping("/updateStreet")
    R updateStreet(@RequestBody ComStreetVO comStreetVO);

    /**
     * 删除街道
     * */
    @GetMapping("/removeStreet")
    R removeStreet(@RequestParam(value = "id",required = false)Long id);

    /***
     * 删除社区
     * */
    @GetMapping("/removeCommunity")
    R removeCommunity(@RequestParam(value = "id",required = false)Long id);

    @PostMapping("/repassCommunity")
    R repassCommunity(@RequestBody ComActVO comActVO);

    @PostMapping("/repassStreet")
    R repassStreet(@RequestBody ComStreetVO comActVO);
}

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

@@ -4,6 +4,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -93,4 +94,30 @@
        return comStreetService.detailStreet(id);
    }


    @PostMapping("/updateStreet")
    public R updateStreet(@RequestBody ComStreetVO comStreetVO){
        return comStreetService.update(comStreetVO);
    }

    @GetMapping("/removeStreet")
    public R remove(@RequestParam(value = "id",required = false)Long id){
        return comStreetService.remove(id);
    }

    @GetMapping("/removeCommunity")
    public R removeCommunity(@RequestParam(value = "id",required = false)Long id){
        return comStreetService.removeCommunity(id);
    }

    @PostMapping("/repassCommunity")
    public R repassCommunity(@RequestBody ComActVO comActVO){
       return comStreetService.repassCommunity(comActVO);
    }

    @PostMapping("/repassStreet")
    public R repassStreet(@RequestBody ComStreetVO comActVO){
        return comStreetService.repssStreet(comActVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -113,4 +113,6 @@
    @Select("select name from com_pb_check_unit where id=#{id}")
    String selectUnitName(@Param("id") Long id);

    @Select("select community_id from com_act where street_id=#{id}")
    List<Long> selectCommunityByStreetId(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java

@@ -117,4 +117,6 @@

    private String appId;

    private String solvePhone;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComStreetDO.java

@@ -65,4 +65,9 @@
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 调节站电话
     * */
    private String solvePhone;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java

@@ -4,6 +4,7 @@

import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;

/**
@@ -55,4 +56,30 @@
     * @return 删除结果
     */
    R delectStreat(List<Long> Ids);

    /**
     * 修改街道信息
     * @param comStreetVO 街道信息
     * */
    R update(ComStreetVO comStreetVO);

    /**
     * 删除街道
     * */
    R remove(Long id);
    /**
     * 删除社区
     * */
    R removeCommunity(Long id);

    /**
     * 重置社区密码
     * */
    R repassCommunity(ComActVO comActVO);


    /**
     * 重置街道密码
     * */
    R repssStreet(ComStreetVO comActVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java

@@ -4,8 +4,13 @@

import javax.annotation.Resource;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComEventMapper;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.util.MyAESUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@@ -42,6 +47,9 @@

    @Resource
    private UserService userService;

    @Resource
    private ComEventMapper comEventMapper;

    /**
     * 新增社区
@@ -193,4 +201,66 @@
        return R.fail();
    }


    /**
     * 修改街道信息
     * @param comStreetVO 街道信息
     * */
    @Override
    public R update(ComStreetVO comStreetVO) {
        ComStreetDO comStreetDO=new ComStreetDO();
        BeanUtils.copyProperties(comStreetVO,comStreetDO );
        return R.ok(comStreetDAO.updateById(comStreetDO));
    }

    /**
     * 删除街道
     * */
    @Override
    public R remove(Long id) {
        //是否有未结事件
        List<Long> longs = comActDAO.selectCommunityByStreetId(id);
        List<ComEvent> comEvents = comEventMapper.selectList(new QueryWrapper<ComEvent>().lambda().in(ComEvent::getEventProcessStatus, (4), (6), (7), (8)).in(ComEvent::getRequestUserCommunity, longs));
        if (comEvents.size()!=0){
            return R.fail("有未结事件不可删除");
        }
        comStreetDAO.deleteById(id);
        return R.ok();
    }

    @Override
    public R removeCommunity(Long id) {
        //是否有未结案件
        List<ComEvent> comEvents = comEventMapper.selectList(new QueryWrapper<ComEvent>().lambda().in(ComEvent::getEventProcessStatus, (4), (6), (7), (8)).eq(ComEvent::getRequestUserCommunity, id));
        if (comEvents.size()!=0){
            return R.fail("有未结事件不可删除");
        }
        comActDAO.deleteById(id);
        return R.ok();
    }

    @Override
    public R repassCommunity(ComActVO comActVO) {
        ComActDO comActDO=new ComActDO();
        try {
            comActDO.setPassword(MyAESUtil.Encrypt(comActVO.getPassword(),"Ryo7M3n8loC5Abcd" ));
        } catch (Exception e) {
            e.printStackTrace();
        }
        comActDO.setCommunityId(comActVO.getCommunityId());
        return R.ok(comActDAO.updateById(comActDO));
    }

    @Override
    public R repssStreet(ComStreetVO comActVO) {
        ComStreetDO comStreetDO=new ComStreetDO();
        try {
            comStreetDO.setPassword(MyAESUtil.Encrypt(comActVO.getPassword(),"Ryo7M3n8loC5Abcd" ));
        } catch (Exception e) {
            e.printStackTrace();
        }
        comStreetDO.setStreetId(comActVO.getStreetId());
        return R.ok(comStreetDAO.updateById(comStreetDO));
    }

}