bug修改

101captain

2022-07-24 67ab614a39fcd33648dcffc2ba2799078f5033e5

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -94,9 +94,6 @@
    public Long getAreaId() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long areaId = loginUserInfo.getAreaId();
        if (null == areaId) {
            throw new ServiceException("用户未绑定小区");
        }
        return areaId;
    }
    /**

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

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +21,8 @@
@Data
@ApiModel("四长四员实体")
public class ComActFourMemberVO {
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 用户id

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

@@ -4,6 +4,8 @@
import java.time.LocalDateTime;
import java.util.Date;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.format.annotation.DateTimeFormat;

import com.fasterxml.jackson.annotation.JsonFormat;
@@ -25,6 +27,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 状态 0待审核 1已上架 2已驳回 3已下架

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.cluster.admin;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class PageClusterAdminVo {

    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("群团组织名称")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java

@@ -4,6 +4,8 @@

import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class ComActIntegralUserRuleAdminVO {

    @ApiModelProperty("积分任务规则id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("积分任务规则名字")
    private String name;

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

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.reserve;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
public class ComActReserveListAdminVO {

    @ApiModelProperty("预约登记id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("社区id")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6360,7 +6360,7 @@
     * @return 单条数据
     */
    @GetMapping("/comActFourMember/{id}")
    R comActFourMemberSelectOne(@PathVariable("id") Integer id);
    R comActFourMemberSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java

@@ -27,7 +27,7 @@
     * @return 单条数据
     */
    @GetMapping("/comPropertyRepair/{id}")
    R comPropertyRepairSelectOne(@PathVariable("id") Integer id);
    R comPropertyRepairSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据

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

@@ -51,7 +51,7 @@
     */
    @ApiOperation(value ="通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActFourMemberSelectOne(id);
    }


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

@@ -88,7 +88,7 @@
     */
    @ApiOperation("详情接口")
    @GetMapping("/{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.propertyService.comPropertyRepairSelectOne(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java

@@ -48,7 +48,7 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActFourMemberService.get(id);
    }


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

@@ -29,8 +29,8 @@
     * @return
     */
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
    ComActFourMemberVO getByIdVillage(Integer id);
    ComActFourMemberVO getById(Long id);
    ComActFourMemberVO getByIdVillage(Long id);

    /**
     * 获取四长四员基础数据

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseApply.java

@@ -32,13 +32,13 @@
    private static final long serialVersionUID = 225290522401641721L;

    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /**
     * 物品id
     */
    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;

    /**
     * 物品数量

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseBase.java

@@ -29,7 +29,7 @@
    private static final long serialVersionUID = -68726161070095574L;

    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /**
     * 义仓说明

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java

@@ -28,13 +28,13 @@
    private static final long serialVersionUID = -74893029545359720L;

    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /**
     * 物品id
     */
    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;

    /**
     * 操作内容
@@ -52,7 +52,7 @@
     * 操作人
     */
    @ApiModelProperty(value = "操作人")
    private Integer userId;
    private Long userId;

    /**
     *类型 1签收，取消操作 2捐赠操作
@@ -64,7 +64,7 @@
     * 申请id
     */
    @ApiModelProperty(value = "申请id")
    private Integer applyId;
    private Long applyId;

    public interface type{
        int bxs=1;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageDO.java

@@ -2,9 +2,7 @@

import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

@@ -16,6 +14,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java

@@ -39,7 +39,7 @@
     */
    R delete(ComActFourMemberVO comActFourMemberVO);

    R get(Integer id);
    R get(Long id);

    /**
     * 小程序四长四员查询居民列表

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

@@ -196,7 +196,7 @@
    }

    @Override
    public R get(Integer id) {
    public R get(Long id) {
        return R.ok(comActFourMemberDao.getById(id));
    }


 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java

@@ -42,7 +42,7 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.comPropertyRepairService.selectDetail(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java

@@ -21,5 +21,5 @@
@Mapper
public interface ComPropertyRepairDao extends BaseMapper<ComPropertyRepair> {
    IPage<ComPropertyRepairVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    ComPropertyRepairVO selectDetail(Integer id);
    ComPropertyRepairVO selectDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java

@@ -23,5 +23,5 @@
    /**
     * 详情查询
     */
    R selectDetail(Integer id);
    R selectDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -33,7 +33,7 @@
    }

    @Override
    public R selectDetail(Integer id) {
    public R selectDetail(Long id) {
        return R.ok(comPropertyRepairDao.selectDetail(id));
    }
}