项目管理

luoxinwu

2023-12-15 5bfe71edf4c4bb8e23ae365aa53433b1679e9e5c

项目管理

 springcloud_k8s_panzhihuazhihuishequ/.idea/jarRepositories.xml

@@ -4,12 +4,12 @@
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Central Repository" />
      <option name="url" value="https://repo.maven.apache.org/maven2" />
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Central Repository" />
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
      <option name="url" value="https://repo.maven.apache.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="releases" />
@@ -32,16 +32,16 @@
      <option name="url" value="http://47.104.148.185:8001/repository/maven-snapshots/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="spring-snapshots" />
      <option name="name" value="Spring Snapshots" />
      <option name="url" value="https://repo.spring.io/snapshot" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="public" />
      <option name="name" value="public" />
      <option name="url" value="http://47.104.148.185:8001/repository/maven-public/" />

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -258,6 +258,11 @@
        return communityService.getNeighborTopicByApp(name);
    }

    @GetMapping("topic/list/new")
    public R getNeighborTopicByAppNew(@RequestParam(value = "name", defaultValue = "", required = false) String name){
        return communityService.getNeighborTopicByAppNew(name);
    }

    @ApiOperation(value = "用户删除邻里圈")
    @PostMapping("delete")
    public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -21,10 +22,6 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
@@ -301,6 +298,21 @@
        return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
    }

    @PostMapping("/getProject/list")
    public R getProjectList(@RequestBody ProjectVO projectVO){
        return partyBuildingService.getProjectList(projectVO);
    }

    @PostMapping("/add/project")
    public R addProject(@RequestBody ProjectVO projectVO){
        return partyBuildingService.addProject(projectVO);
    }

    @PostMapping("/delete/project")
    public R deleteProject(@RequestBody ProjectVO projectVO){
        return partyBuildingService.deleteProject(projectVO);
    }

    @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/registerMember")
    public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ProjectVO.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.vos.partybuilding;

import lombok.Data;

import java.util.List;

@Data
public class ProjectVO {

    /**
     * 单位id
     */
    private Long unitId;

    /**
     * 单位名称
     */
    private String unitName;

    /**
     * 特长
     */
    private String speciality;

    /**
     * 项目名称
     */
    private String project;

    /**
     * 电话号码
     */
    private String phone;

    /**
     * 图片地址
     */
    private String image;

    private List<Long> ids;

}

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

@@ -5046,6 +5046,8 @@
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("name") String name);

    @GetMapping("/neighbor/getNeighborTopicByAppNew")
    R getNeighborTopicByAppNew(@RequestParam("name") String name);
    /**
     * 删除话题
     * @param id

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -613,6 +613,15 @@
    R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);


    @PostMapping("/partybuildIng/getProject")
    public R getProjectList(@RequestBody ProjectVO projectVO);

    @PostMapping("/partybuildIng/addProject")
    public R addProject(@RequestBody ProjectVO projectVO);

    @PostMapping("/partybuildIng/deleteProject")
    public R deleteProject(@RequestBody ProjectVO projectVO);

    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);


 springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml

@@ -28,7 +28,7 @@

#spring:
#  application:
#    name: config
#    name: huacheng-config
#  profiles:
#    active: native
#  cloud:

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

@@ -378,6 +378,11 @@
        return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
    }

    @GetMapping("/getNeighborTopicByAppNew")
    public R getNeighborTopicByAppNew(@RequestParam("name") String name){
        return comActNeighborCircleTopicService.getNeighborTopicByAppNew(name);
    }

    /**
     * 删除话题
     * @param id

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

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.service_community.entity.ComActNeighborCircleTopicNew;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface ComActNeighborCircleTopicNewMapper extends BaseMapper<ComActNeighborCircleTopicNew> {

    List<ComActNeighborCircleTopicAppVO> getNeighborTopicByAppNew(@Param("name") String name);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActNeighborCircleTopicNew.java

New file
@@ -0,0 +1,90 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class ComActNeighborCircleTopicNew implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 话题名称
     */
    private String name;

    /**
     * 状态（1.启用 2.禁用）
     */
    private Integer status;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 创建人
     */
    private Long createBy;

    /**
     * 热度
     */
    private Long hotNum;

    /**
     * 邻里圈数量
     */
    private Integer count;

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */
    private Integer belongType;

    /**
     * 话题logo
     */
    private String logo;

    private Integer sort;

    /**
     * 状态（1.启用  2.禁用）
     */
    public interface status{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="
                + createAt + ", createBy=" + createBy + "}";
    }

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */
    public interface BelongType{
        int LLQ = 1;
        int WTQD = 2;
        int XQQD = 3;
    }
}

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

@@ -49,6 +49,8 @@
     */
    R getNeighborTopicByApp(String name);

    R getNeighborTopicByAppNew(String name);

    /**
     * 小程序-用户新增话题
     * @param circleTopicAppDTO 请求参数

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

@@ -3,8 +3,10 @@
import java.util.Date;

import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicNewMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -35,6 +37,8 @@

    @Resource
    private ComActNeighborCircleDAO comActNeighborCircleDAO;
    @Autowired
    private ComActNeighborCircleTopicNewMapper comActNeighborCircleTopicNewMapper;
    /**
     * 分页查询邻里圈话题列表
     *
@@ -107,6 +111,11 @@
        return R.ok(this.baseMapper.getNeighborTopicByApp(name));
    }

    @Override
    public R getNeighborTopicByAppNew(String name) {
        return R.ok(comActNeighborCircleTopicNewMapper.getNeighborTopicByAppNew(name));
    }

    /**
     * 小程序-用户新增话题
     * @param circleTopicAppDTO 请求参数

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicNewMapper.xml

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActNeighborCircleTopicNewMapper">

    <select id="getNeighborTopicByAppNew"
            resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">
        SELECT canct.id, canct.`name`,`logo`, canct.hot_num
        from com_act_neighbor_circle_topic_new as canct where canct.`status` = 1
        <if test="name != null and name != &quot;&quot;">
            and canct.`name` like concat('%',#{name},'%')
        </if>
        order by canct.sort asc
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_dlz/pom.xml

@@ -87,5 +87,4 @@
        </dependency>
    </dependencies>


</project>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -782,6 +782,21 @@
        return comPbMemberService.getPagePbMember(partyBuildingMemberVO);
    }

    @PostMapping("/getProject")
    public R getProject(@RequestBody ProjectVO projectVO){
      return   comPbMemberService.getProject(projectVO);
    }

    @PostMapping("/addProject")
    public R addProject(@RequestBody ProjectVO projectVO){
        return comPbMemberService.addProject(projectVO);
    }

    @PostMapping("/deleteProject")
    public R deleteProject(@RequestBody ProjectVO projectVO){
        return comPbMemberService.deleteProject(projectVO);
    }

    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(phone,type);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java

New file
@@ -0,0 +1,9 @@
package com.panzhihua.service_dangjian.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_dangjian.entity.ComActProject;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface ComActProjectMapper extends BaseMapper<ComActProject> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActProject.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_dangjian.entity;

import lombok.Data;

@Data
public class ComActProject {

    private Long id;

    private Long unitId;

    private String unitName;

    private String speciality;

    private String project;

    private String phone;

    private String image;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -250,6 +250,11 @@

    R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO);

    R getProject(ProjectVO projectVO);

    R addProject(ProjectVO projectVO);

    R deleteProject(ProjectVO projectVO);
    R getPartyMember(String phone,Integer type);

    R memberDetail(Long id);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
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;
@@ -23,6 +24,7 @@
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.entity.ComActProject;
import com.panzhihua.service_dangjian.model.dos.ComPbDynDO;
import com.panzhihua.service_dangjian.model.dos.ComPbDynUserDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
@@ -30,6 +32,7 @@
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -69,6 +72,8 @@
    private ComPbDynUserDAO comPbDynUserDAO;
    @Resource
    private UserService userService;
    @Autowired
    private ComActProjectMapper comActProjectMapper;

    /**
     * 新增党员
@@ -1198,6 +1203,38 @@
    }

    @Override
    public R getProject(ProjectVO projectVO) {
        LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
        wrapper.eq(projectVO.getSpeciality()!=null,ComActProject::getSpeciality,projectVO.getSpeciality());
        wrapper.eq(projectVO.getProject()!=null,ComActProject::getProject,projectVO.getProject());
        List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
        return R.ok(comActProjects);
    }

    @Override
    public R addProject(ProjectVO projectVO) {
        ComActProject comActProject = new ComActProject();
        comActProject.setUnitId(projectVO.getUnitId());
        comActProject.setUnitName(projectVO.getUnitName());
        comActProject.setSpeciality(projectVO.getSpeciality());
        comActProject.setProject(projectVO.getProject());
        comActProject.setPhone(projectVO.getPhone());
        comActProject.setImage(projectVO.getImage());
        comActProjectMapper.insert(comActProject);
        return R.ok();
    }

    @Override
    public R deleteProject(ProjectVO projectVO) {
        List<Long> ids = projectVO.getIds();
        LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.in(ComActProject::getId,ids);
        comActProjectMapper.delete(wrapper);
        return R.ok();
    }

    @Override
    public R getPartyMember(String phone,Integer type) {

        return R.ok(comPbMemberDAO.selectDetail(phone,type));