张天森
2022-07-13 279387d34bc34635a3db843082ab4f81224af8ee
update
2个文件已修改
24 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -217,6 +217,7 @@
     * @param password  密码
     * @return  登录结果
     */
    @OperLog(operModul = "一键报警APP登录 ")
    @PostMapping("/loginAlarmApp")
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
@@ -232,7 +233,7 @@
     *            密码
     * @return 登录结果
     */
    @OperLog(operModul = "便民服务商家后台登录")
    @OperLog(operModul = "便民服务商家后台登录 ")
    @PostMapping("/loginMerchantBackStage")
    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
@@ -262,6 +263,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginMcsUser")
    @OperLog(operModul = "微商业街用户登录")
    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
        return R.ok(loginReturnVO);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java
@@ -70,15 +70,15 @@
        return userService.listmenu(userId);
    }
    @PostMapping("/indexData")
    @ApiOperation(value = "新数据统计看板",response = IndexDataAnalysisVO.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县,2:所有街道,3:所有社区,4:跟据街道筛选",dataType = "Integer"),
            @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
    })
    public R indexData(@RequestParam(value = "type",required = false) Integer type,
                       @RequestParam(value = "type",required = false) Long streetId){
        return userService.newIndexData(type,streetId);
    }
//    @PostMapping("/indexData")
//    @ApiOperation(value = "新数据统计看板",response = IndexDataAnalysisVO.class)
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县,2:所有街道,3:所有社区,4:跟据街道筛选",dataType = "Integer"),
//            @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
//    })
//    public R indexData(@RequestParam(value = "type",required = false) Integer type,
//                       @RequestParam(value = "type",required = false) Long streetId){
//        return userService.newIndexData(type,streetId);
//    }
}