修改bug以及app端登录如果未绑定网格提示接口、首页左上角网格选择接口

huanghongfa

2021-07-15 20265a287301b45ff7bb7de6a197b8110feaa853

修改bug以及app端登录如果未绑定网格提示接口、首页左上角网格选择接口

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.exceptions.TokenException;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.JWTTokenUtil;
@@ -153,7 +154,7 @@
     */
    @PostMapping("/loginGridApp")
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridApp(account, password);
        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
        return R.ok(loginReturnVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -1,6 +1,7 @@
package com.panzhihua.auth.service;

import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;

/**
@@ -63,7 +64,7 @@
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginGridApp(String account, String password);
    LoginReturnsVO loginGridApp(String account, String password);

    /**
     * 网格综治后台登录

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -3,6 +3,7 @@
import com.panzhihua.auth.service.LoginService;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -155,16 +156,17 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginGridApp(String account, String password) {
    public LoginReturnsVO loginGridApp(String account, String password) {
        Authentication authentication = null;
        authentication = authenticationManager
                .authenticate(new UsernamePasswordAuthenticationToken(account+"_6", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO=new LoginReturnVO();
        LoginReturnsVO loginReturnVO=new LoginReturnsVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setUserId(loginUser.getUserId());
        return loginReturnVO;
    }

@@ -188,4 +190,5 @@
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

}

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

@@ -17,4 +17,13 @@
    @ApiModelProperty(value = "查询结束时间")
    private String endTime;

    @ApiModelProperty(value = "事件状态(1待处理2已解决3待验证)")
    private Integer eventProcessStatus;

    @ApiModelProperty(value = "是否红牌（1.是 0.否）")
    private Integer redCard;

    @ApiModelProperty(value = "是否黄牌（1.是 0.否）")
    private Integer yellowCard;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridCascadeListDTO.java

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

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

@Data
@ApiModel("网格列表级联请求参数")
public class EventGridCascadeListDTO {

    @ApiModelProperty(value = "类型（1.社区  2.网格）")
    private Integer type;

    @ApiModelProperty(value = "登陆用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 类型（1.社区  2.网格）
     */
    public interface type{
        int sq = 1;
        int wg = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnsVO.java

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

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: 2020-11-27 08:55
 **/
@Data
@ApiModel(value = "登录返回体")
public class LoginReturnsVO {
    @ApiModelProperty("接口请求令牌")
    private String token;
    @ApiModelProperty("刷新token有效期长")
    private String refreshToken;
    @ApiModelProperty("用户id")
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1224,4 +1224,12 @@
     */
    @GetMapping("/eventgriddata/lc/list")
    R getLcGridLists();

    /**
     * 首页查询网格级联列表
     * @param cascadeListDTO    请求参数
     * @return  网格列表
     */
    @PostMapping("/map/getMapGridListsByApp")
    R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -768,4 +768,7 @@
     */
    @PostMapping("listagreements")
    R listAgreements(@RequestParam("communityId")Long communityId);

    @PostMapping("user/getUserGrids")
    R getGridIsOk(@RequestParam("userId")Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java

@@ -1,13 +1,19 @@
package com.panzhihua.grid_app.api;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.grid_app.model.vos.LoginBody;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

@@ -22,6 +28,8 @@
public class LoginApi extends BaseController {
    @Resource
    private TokenService tokenService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "网格综治APP登录",response = LoginReturnVO.class)
    @PostMapping("login")
@@ -34,6 +42,19 @@
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridApp(account, password);
        if(R.isOk(r)){
            LoginReturnsVO returnsVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginReturnsVO.class);
            //查询用户是否绑定网格，如果未绑定则提示用户
            R r1 = userService.getGridIsOk(returnsVO.getUserId());
            if(R.isOk(r1)){
                LoginReturnVO returnVO = new LoginReturnVO();
                BeanUtils.copyProperties(returnsVO,returnVO);
                r.setData(returnVO);
                return r;
            }else {
                return R.fail("请联系管理员创建网格管理权限");
            }
        }
        return r;
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.grid_app.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO;
@@ -9,10 +10,7 @@
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -56,4 +54,18 @@
        return gridService.getMapGridListByApp(userInfoVO.getUserId());
    }

    @ApiOperation(value = "查询网格员关联网格列表级联-lyq",response = EventMapGridVO.class)
    @PostMapping("getGridLists")
    public R getGridLists(@RequestBody EventGridCascadeListDTO cascadeListDTO){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null || userInfoVO.getUserId() == null){
            return R.fail("请先登录");
        }
        if(cascadeListDTO.getType() == null){
            return R.fail("参数错误");
        }
        cascadeListDTO.setUserId(userInfoVO.getUserId());
        return gridService.getMapGridListsByApp(cascadeListDTO);
    }

}

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

@@ -840,6 +840,15 @@
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "<if test='screenEventDTO.eventProcessStatus != null'>" +
            " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " +
            " </if> " +
            "<if test='screenEventDTO.redCard != null'>" +
            " AND e.red_card = #{screenEventDTO.redCard} " +
            " </if> " +
            "<if test='screenEventDTO.yellowCard != null'>" +
            " AND e.yellow_card = #{screenEventDTO.yellowCard} " +
            " </if> " +
            "UNION ALL SELECT " +
            " IFNULL( NULL, 7 ) AS type, " +
            " id AS eventId, " +
@@ -854,6 +863,9 @@
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "<if test='screenEventDTO.eventProcessStatus != null'>" +
            " AND handle_status = #{screenEventDTO.eventProcessStatus} " +
            " </if> " +
            " </script>")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.api;

import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWainDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWorkTrajectoryDTO;
import com.panzhihua.common.model.vos.R;
@@ -83,4 +84,9 @@
        return eventGridMemberWarnLogService.gridMemberWorkWarning(gridMemberWainDTO);
    }

    @PostMapping("getMapGridListsByApp")
    public R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO){
        return eventGridMemberRelationService.getMapGridListsByApp(cascadeListDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
@@ -62,4 +63,6 @@

    Integer getBuildingCount(@Param("villageId") Long villageId);

    List<EventMapGridVO> getMapGridListsByApp(@Param("cascadeListDTO") EventGridCascadeListDTO cascadeListDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java

@@ -69,6 +69,8 @@

    R gridMemberCascadeList(EventGridMemberCascadeAddDTO memberCascadeAddDTO);

    R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO);





 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
@@ -160,4 +161,9 @@
        return R.ok(result);
    }

    @Override
    public R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO){
        return R.ok(eventGridMemberRelationMapper.getMapGridListsByApp(cascadeListDTO));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -293,6 +293,8 @@
        if (eventGridDataDO == null) {
            return R.fail("网格不存在");
        }
        eventDO.setGridMemberCommunity(eventGridDataDO.getGridCommunityId());
        eventDO.setGridMemberStreet(eventGridDataDO.getGridStreetId());

        //检查特殊人群上报时参数
        if(commonEventAddDTO.getEventType().equals(6)){
@@ -311,6 +313,7 @@
        eventDO.setCreateBy(commonEventAddDTO.getUserId());
        eventDO.setSubmitDate(new Date());
        eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));

        if (eventMapper.insert(eventDO) == 1) {

            //如果是特殊人群，则新增特殊人群与事件关系
@@ -1031,6 +1034,8 @@
        eventDO.setEventCategory(2l);//宣传事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setEventType(8);
        eventDO.setGridMemberCommunity(eventGridDataDO.getGridCommunityId());
        eventDO.setGridMemberStreet(eventGridDataDO.getGridStreetId());
        if(publicityEventAddDTO.getGridMemberId()!=null) {
            eventDO.setGridMemberId(publicityEventAddDTO.getGridMemberId());
        }else{
@@ -1748,9 +1753,9 @@
//            return R.fail("经纬度参数错误");
//        }
        //经纬度匹配规则：（短（纬度）在前长（经度）在后，不要擅自修改此规则，否则出现问题后果自负）
        if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
            return R.fail("经纬度参数错误");
        }
//        if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
//            return R.fail("经纬度参数错误");
//        }
        String latLngArr[] = latLng.split(",");
        try {
            Double lat = Double.valueOf(latLngArr[1]);

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -22,8 +22,10 @@
import com.panzhihua.common.model.vos.visit.*;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.EventGridDataMapper;
import com.panzhihua.service_grid.dao.EventResourceMapper;
import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventResourceService;
@@ -62,6 +64,9 @@

    @Resource
    private EventResourceService eventResourceService;

    @Resource
    private EventGridDataMapper eventGridDataMapper;

    @Value("${domain.aesKey:}")
    private String aesKey;
@@ -244,7 +249,7 @@
            eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
            eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
            eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));

            eventVisitingTasksDetailsVO.setHappentAddress(eventVisitingTasksDO.getAddress());
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
@@ -293,8 +298,17 @@
        if(count > 0){
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }



        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
        //查询网格
        EventGridDataDO gridDataDO = eventGridDataMapper.selectById(gridId);
        if(gridDataDO != null){
            visitingTasksDO.setGridMemberCommunity(gridDataDO.getGridCommunityId());
            visitingTasksDO.setGridMemberStreet(gridDataDO.getGridStreetId());
        }
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
//        visitingTasksDO.setGridMemberCommunity(communityId);
//        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -281,10 +281,10 @@
            ) AS handleTSTotal,
            ( SELECT count( id ) FROM event_visiting_tasks WHERE grid_member = su.user_id AND event_status = 2
                <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != &quot;&quot;">
                    AND DATE_FORMAT(dell_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime}
                    AND DATE_FORMAT(submit_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime}
                </if>
                <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != &quot;&quot;">
                    AND DATE_FORMAT(dell_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime}
                    AND DATE_FORMAT(submit_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime}
                </if>
            ) AS handleZFTotal,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 AND handler_id = su.user_id
@@ -341,4 +341,23 @@
        select count(id) from com_mng_building where village_id = #{villageId}
    </select>

    <select id="getMapGridListsByApp" parameterType="com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO"
            resultType="com.panzhihua.common.model.vos.grid.EventMapGridVO">
        <if test="cascadeListDTO.type != null and cascadeListDTO.type == 1">
            SELECT DISTINCT
            egmr.grid_community_id as gridId,
            ca.`name` AS gridName
            FROM
            event_grid_member_relation AS egmr
            LEFT JOIN com_act AS ca ON ca.community_id = egmr.grid_community_id
            WHERE
            grid_member_id = #{cascadeListDTO.userId}
        </if>

        <if test="cascadeListDTO.type != null and cascadeListDTO.type == 2">
            select id as gridId,grid_name AS gridName from event_grid_member_relation as egmr where grid_member_id = #{cascadeListDTO.userId} and grid_community_id = #{cascadeListDTO.communityId}
        </if>

    </select>

</mapper>

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

@@ -978,4 +978,9 @@
        return userService.listAgreements(communityId);
    }

    @PostMapping("user/getUserGrids")
    public R getGridIsOk(@RequestParam("userId") Long userId) {
        return userService.getGridIsOk(userId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -425,4 +425,7 @@
    @Select("select id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
    Long getLcMemberId(@Param("gridMemberId") Long gridMemberId);

    @Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}")
    Integer getGridIsOk(@Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -467,4 +467,6 @@
     * @return  收益说明
     */
    R listAgreements(Long communityId);

    R getGridIsOk(Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2162,4 +2162,14 @@
        });
        return R.ok(sysUserAgreementVOS);
    }

    @Override
    public R getGridIsOk(Long userId){
        Integer count = this.userDao.getGridIsOk(userId);
        if(count > 0){
            return R.ok(count);
        }else{
            return R.fail();
        }
    }
}