花城-智慧社区
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
huanghongfa
2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce 
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java


@@ -1,5 +1,13 @@


package com.panzhihua.applets.api;




import java.util.Date;




import javax.annotation.Resource;




import org.springframework.util.ObjectUtils;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import com.alibaba.fastjson.JSONObject;


import com.panzhihua.applets.weixin.CheckService;


import com.panzhihua.common.controller.BaseController;


@@ -14,15 +22,10 @@


import com.panzhihua.common.service.partybuilding.PartyBuildingService;


import com.panzhihua.common.service.user.UserService;


import com.panzhihua.common.validated.AddGroup;




import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.extern.slf4j.Slf4j;


import org.springframework.util.ObjectUtils;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.Date;




/**


 * @program: springcloud_k8s_panzhihuazhihuishequ


@@ -41,6 +44,12 @@


    private UserService userService;


    @Resource


    private CheckService checkService;




    public static void main(String[] args) {


        Date date = new Date();


        String dateFormat = String.format("%tF %tT ", date, date);


        System.out.println(dateFormat);


    }




    @ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )


    @PostMapping("pagedynamic")


@@ -73,6 +82,21 @@


        return partyBuildingService.pageActivity(partyBuildingActivityVO);


    }




    // @ApiOperation(value = "增加阅读记录")


    // @PostMapping("adddynuser")


    // public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {


    // Long id = partyBuildingComPbDynVO.getId();


    // if (ObjectUtils.isEmpty(id)||0==id) {


    // return R.fail("主键id不能为空");


    // }


    // Long userId = this.getUserId();


    // ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();


    // comPbDynUserVO.setCreateAt(new Date());


    // comPbDynUserVO.setDynId(id);


    // comPbDynUserVO.setUserId(userId);


    // return partyBuildingService.addDynUser(comPbDynUserVO);


    // }




    @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )


    @GetMapping("infodynamic")


    public R infoYnamic(@RequestParam("id") Long id) {


@@ -87,7 +111,8 @@


                userId = loginUserInfo.getUserId();


            }




            PartyBuildingComPbDynVO partyBuildingComPbDynVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),PartyBuildingComPbDynVO.class);


            PartyBuildingComPbDynVO partyBuildingComPbDynVO =


                JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);


            if(userId != null){


                ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();


                comPbDynUserVO.setCreateAt(new Date());


@@ -106,21 +131,6 @@


        }


        return r;


    }




//    @ApiOperation(value = "增加阅读记录")


//    @PostMapping("adddynuser")


//    public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {


//        Long id = partyBuildingComPbDynVO.getId();


//        if (ObjectUtils.isEmpty(id)||0==id) {


//            return R.fail("主键id不能为空");


//        }


//        Long userId = this.getUserId();


//        ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();


//        comPbDynUserVO.setCreateAt(new Date());


//        comPbDynUserVO.setDynId(id);


//        comPbDynUserVO.setUserId(userId);


//        return partyBuildingService.addDynUser(comPbDynUserVO);


//    }




    @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )


    @PostMapping("pagepartycommittee")


@@ -156,7 +166,8 @@


        R r = partyBuildingService.putActivitySignUp(activitySignUpDTO);


        if (R.isOk(r)&&activitySignUpDTO.getType().intValue()==1) {


            R r2 = partyBuildingService.activityinfo(id, userId);


            PartyBuildingActivityVO partyBuildingActivityVO=JSONObject.parseObject(JSONObject.toJSONString(r2.getData()),PartyBuildingActivityVO.class);


            PartyBuildingActivityVO partyBuildingActivityVO =


                JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);


            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();


            sysUserNoticeVO.setUserId(userId);


            sysUserNoticeVO.setType(1);


@@ -164,7 +175,8 @@


            sysUserNoticeVO.setBusinessType(2);


            sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());


            Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();


            sysUserNoticeVO.setBusinessContent(String.format("活动将于 %tF %tT  开始，请按时参加", activityTimeBegin,activityTimeBegin));


            sysUserNoticeVO


                .setBusinessContent(String.format("活动将于 %tF %tT  开始，请按时参加", activityTimeBegin, activityTimeBegin));


            sysUserNoticeVO.setBusinessId(id);


            sysUserNoticeVO.setStatus(0);


            sysUserNoticeVO.setBusinessStatus(2);


@@ -231,11 +243,5 @@


//            comListPartyDTO.setCommunityId(communityId);


//        }


        return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);


    }




    public static void main(String[] args) {


        Date date = new Date();


        String dateFormat = String.format("%tF %tT ", date, date);


        System.out.println(dateFormat);


    }


}