一起议

huanghongfa

2021-01-24 8e415f36a8208ac988dad3ceef3225780850b82c

一起议

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,8 +23,29 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -407,7 +428,7 @@
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="22470000" />
      <workItem from="1611365644515" duration="25755000" />
    </task>
    <servers />
  </component>
@@ -431,10 +452,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611395776792">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611449962791">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611395776792" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611449962791" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -463,54 +484,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="256" key="GridCell.Tab.0.bottom" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.0.center" timestamp="1611398020879">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611451193277">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" />
    <state width="1031" height="256" key="GridCell.Tab.0.left" timestamp="1611398020879">
    <state width="1031" height="477" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611451193277" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611451193277">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" />
    <state width="1031" height="256" key="GridCell.Tab.0.right" timestamp="1611398020879">
    <state width="1031" height="477" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611451193277" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" />
    <state width="1031" height="256" key="GridCell.Tab.1.bottom" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.1.center" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.1.left" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.1.right" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.2.bottom" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.2.center" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.2.left" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="256" key="GridCell.Tab.2.right" timestamp="1611398020880">
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611451193278">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="256" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" />
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611451193278" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -535,10 +556,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611398270718">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611450778769">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611398270718" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611450778769" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

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

@@ -9,6 +9,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
@@ -68,6 +69,7 @@
        if (null!=isMy&&isMy.intValue()==1) {
            pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
        }
        pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
        return communityService.pageDiscussApplets(pageComActDiscussDTO);
    }

@@ -96,6 +98,7 @@

    @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class)
    @GetMapping("discuss")
    @ApiImplicitParam(name = "id",value = "一起议主键",required = true)
    public R detailDiscuss(@RequestParam("id") Long id) {
        return communityService.detailDiscussApplets(id);
    }
@@ -125,6 +128,19 @@
        return communityService.addDiscussCommentBack(comActDiscussCommentDTO);
    }

    @ApiOperation(value = "一起议-投票")
    @GetMapping("discussoptionuser")
    @ApiImplicitParam(name = "id",value = "一起议选项主键",required = true)
    public R addDiscussOptionUser(@RequestParam("id") Long id) {
        if (null==id||0==id) {
            return R.fail("选项主键不能为空");
        }
        ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO();
        comActDiscussOptionUserDTO.setDiscussOptionId(id);
        comActDiscussOptionUserDTO.setUserId(this.getUserId());
        return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
    }





 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.dtos.community;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 选项投票
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-24 08:56
 **/
@Data
@ApiModel("选项投票")
public class ComActDiscussOptionUserDTO {


    @ApiModelProperty("一起议选项id")
    private Long discussOptionId;

    @ApiModelProperty("投票人id")
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "登录用户",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "登录用户-用于判断是否点赞和投票",hidden = true)
    private Long loginUserId;

    @ApiModelProperty("小程序使用 1 表示查询我的议题")
    private Integer isMy;
}

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

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;

import java.util.Date;
@@ -63,4 +64,10 @@
    @ApiModelProperty("发布人头像")
    private String imageUrl;

    @ApiModelProperty("是否已经点赞 1 是 0 否")
    private Integer haveSign;

    @ApiModelProperty("是否已经投票 1 是 0 否")
    private Integer haveVote;

}

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

@@ -790,4 +790,12 @@
     */
    @PostMapping("detaildiscussapplets")
    R detailDiscussApplets(@RequestParam("id") Long id);

    /**
     * 一起议-投票
     * @param comActDiscussOptionUserDTO 投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

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

@@ -152,4 +152,14 @@
        return comActDiscussService.detailDiscussApplets(id);
    }

    /**
     * 一起议-投票
     * @param comActDiscussOptionUserDTO 投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO){
        return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
    }

}

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

@@ -103,6 +103,8 @@
            "COUNT( c.id ) commentNum,\n" +
            "COUNT( du.id ) signNum,\n" +
            "if(u.type=1,u.name,a.name) userName,\n" +
            "if(du.id is not null,1,0) haveSign,\n" +
            "if(ou.id is not null,1,0) haveVote,\n" +
            "u.image_url,\n" +
            "d.create_at \n" +
            "FROM\n" +
@@ -111,6 +113,8 @@
            "JOIN com_act a ON d.community_id = a.community_id\n" +
            "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id \n" +
            "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id \n" +
            "LEFT JOIN com_act_discuss_option do ON d.id = do.discuss_id \n" +
            "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId}\n" +
            " where d.community_id=#{pageComActDiscussDTO.communityId}" +
            "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;'>" +
            " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) \n" +

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

@@ -30,7 +30,7 @@
    /**
     * 投票人id
     */
    private String userId;
    private Long userId;

    /**
     * 投票时间

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

@@ -88,4 +88,10 @@
     * @return ComActDiscussVO
     */
    R detailDiscussApplets(Long id);
    /**
     * 一起议-投票
     * @param comActDiscussOptionUserDTO 投票信息
     * @return 投票结果
     */
    R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
}

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

@@ -459,4 +459,35 @@
        }
        return R.ok(comActDiscussVO);
    }

    /**
     * 一起议-投票
     *
     * @param comActDiscussOptionUserDTO 投票信息
     * @return 投票结果
     */
    @Override
    public R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
        Long discussOptionId = comActDiscussOptionUserDTO.getDiscussOptionId();
        Long userId = comActDiscussOptionUserDTO.getUserId();
        ComActDiscussOptionDO comActDiscussOptionDO = comActDiscussOptionDAO.selectById(discussOptionId);
        if (ObjectUtils.isEmpty(comActDiscussOptionDO)) {
            return R.fail("选项不存在");
        }
        Long discussId = comActDiscussOptionDO.getDiscussId();
        List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, discussId));
        List<Long> longList=comActDiscussOptionDOS.stream().map(comActDiscussOptionDO1 -> comActDiscussOptionDO1.getId()).collect(Collectors.toList());
        Integer integer = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getUserId, userId).in(ComActDiscussOptionUserDO::getDiscussOptionId, longList));
        if (integer>0) {
            return R.fail("不要重复投票");
        }
        ComActDiscussOptionUserDO comActDiscussOptionUserDO=new ComActDiscussOptionUserDO();
        comActDiscussOptionUserDO.setUserId(userId);
        comActDiscussOptionUserDO.setDiscussOptionId(discussOptionId);
        int insert = comActDiscussOptionUserDAO.insert(comActDiscussOptionUserDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev


eureka: