金汇微信新增预警处理 我的工作

lidongdong

2023-11-03 3e6c54df3f4f7215d0207cccf6f24c8c26b0eb94

金汇微信新增预警处理  我的工作

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

@@ -3,6 +3,7 @@

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
@@ -14,6 +15,7 @@
import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.bracelet.CommunityBraceletService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -907,4 +909,48 @@
    }


    /******************************************************************************************************************
     *
     *                                  手环处理
     *
     *****************************************************************************************************************/

    @Resource
    private CommunityBraceletService communityBraceletService;
    /**
     * 微信处理接口
     * @param braceletEarlyWarningDO
     * @return
     */
    @PostMapping("/WXdispose")
    public R  WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
    {
        if(com.panzhihua.common.utlis.StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText()))
        {
            return R.fail("处理内容不能为空");
        }
        braceletEarlyWarningDO.setDisposeType("2");
        return communityBraceletService.WXdispose(braceletEarlyWarningDO);
    }



    /**
     * 微信我的预警数据
     * @return
     */
    @GetMapping("/braceletApi/getEarlyWarningList")
    public R getList(@RequestParam("pageNum") Integer pageNum,
              @RequestParam("pageSize") Integer pageSize,
              @RequestParam(value = "equipmentNumber",required = false)  String equipmentNumber,
              @RequestParam(value = "type",required = false)  String type,
              @RequestParam(value = "userName",required = false)  String userName,
              @RequestParam(value = "phone",required = false)  String phone)
    {
        return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
                getUserId()+"",type,userName,phone);
    }



}

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

@@ -232,7 +232,7 @@

    /**
     * 获取预警数据
     * @param communityId
     * @param
     * @return
     */
    @ApiOperation(value = "获取预警数据")
@@ -274,7 +274,7 @@

    /**
     * 处理人
     * @param communityId
     * @param
     * @return
     */
    @ApiOperation(value = "处理人")

 springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java

@@ -323,6 +323,7 @@
            return R.fail("id不能为空");
        }

        //忽略
        if(StringUtils.equals(braceletEarlyWarningDO.getDisposeType(),"4"))
        {
            BraceletEarlyWarningDO da=new BraceletEarlyWarningDO();