首页

huanghongfa

2021-01-25 52dac347a21b0a39a1d8048bfa4647661a627ead

首页

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,6 +24,13 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <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/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -406,7 +413,7 @@
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="17854000" />
      <workItem from="1611536010905" duration="19678000" />
    </task>
    <servers />
  </component>
@@ -450,10 +457,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611560540954">
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611567329549">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611560540954" />
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611567329549" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -462,54 +469,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="417" key="GridCell.Tab.0.bottom" timestamp="1611562921654">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611567379916">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611562921654">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611567379916" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611567379916">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611562921654">
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611567379916" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611567379916">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611562921654">
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611567379916" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611567379916">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611567379916" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611562921654">
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611562921655">
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611567379917">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611567379917" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

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

@@ -213,6 +213,9 @@
            List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
            comActActivityVOS=collect;
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
//            comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
        }
        return R.ok(comActActivityVOS);
    }


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

@@ -138,6 +138,9 @@
    @ApiModelProperty(value = "是不是请求进行中 1 是",hidden = true)
    private Integer isIng;

    @ApiModelProperty("用户实际报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date singDate;


}

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

@@ -19,4 +19,6 @@
    private String behavior;
    @ApiModelProperty("文字")
    private String words;
    @ApiModelProperty("类型 1随手拍 2微心愿 3人脸采集 4志愿者审核")
    private Integer type;
}

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

Binary files differ

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

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java

@@ -13,6 +13,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -50,6 +51,20 @@
            if (R.isOk(r1)) {
                Object data1 = r1.getData();
                List<TodoEventsVO> todoEventsVOS= JSONArray.parseArray(JSONArray.toJSONString(data1),TodoEventsVO.class);
                if (!ObjectUtils.isEmpty(todoEventsVOS)) {
                    todoEventsVOS.forEach(todoEventsVO -> {
                        String function = todoEventsVO.getFunction();
                        if (function.contains("随手拍")) {
                            todoEventsVO.setType(1);
                        }else if(function.contains("微心愿")){
                            todoEventsVO.setType(2);
                        }else if(function.contains("人脸采集")){
                            todoEventsVO.setType(3);
                        }else if(function.contains("志愿者审核")){
                            todoEventsVO.setType(4);
                        }
                    });
                }
                indexDataVO.setTodoEventsVOList(todoEventsVOS);
                r.setData(indexDataVO);
            }

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

@@ -272,6 +272,7 @@
            if (status.intValue()==3) {
                comActActivityVO.setStatus(4);
            }
            comActActivityVO.setSingDate(comActActSignDOS.stream().filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);

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

@@ -303,6 +303,7 @@
            comActActivityVO.setActivityName(comPbActivityDO.getName());
            comActActivityVO.setCover(comPbActivityDO.getCover());
            comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
            comActActivityVO.setSingDate(comPbActivityMemberDOS.stream().filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);