101captain
2021-09-03 96a13895572bd8ef8ee25d0be38d03fb1a84dc09
新增物业模块
1个文件已修改
13个文件已添加
853 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/pom.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/logback-spring.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
New file
@@ -0,0 +1,81 @@
package com.panzhihua.applets.api;
import cn.hutool.core.date.DateUtil;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.service.property.PropertyService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Slf4j
@RestController
@RequestMapping("propertyRepair")
@Api(tags = "物业报修api")
public class ComPropertyRepairApi extends BaseController {
    @Resource
    private PropertyService propertyService;
    /**
     * 分页查询所有数据
     * @return 所有数据
     */
    @ApiOperation("小程序列表接口")
    @PostMapping("/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }
    /**
     * 小程序添加报修
     * @param comPropertyRepairVO
     * @return
     */
    @ApiOperation("小程序添加报修")
    @PostMapping
    public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        comPropertyRepairVO.setCreateTime(DateUtil.date());
        comPropertyRepairVO.setCreateBy(this.getUserId());
        return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
    }
    /**
     * 修改数据
     *
     * @param comPropertyRepairVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("小程序修改报修")
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        if(comPropertyRepairVO!=null&& StringUtils.isNotEmpty(comPropertyRepairVO.getFeedbackContent())){
            comPropertyRepairVO.setFeedbackBy(this.getUserId());
            comPropertyRepairVO.setFeedbackTime(DateUtil.date());
        }
        if(comPropertyRepairVO!=null&&StringUtils.isNotEmpty(comPropertyRepairVO.getReplyContent())){
            comPropertyRepairVO.setReplyTime(DateUtil.date());
        }
        return this.propertyService.comPropertyRepairUpdate(comPropertyRepairVO);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情接口")
    @GetMapping("/{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return this.propertyService.comPropertyRepairSelectOne(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.dtos.property;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel
public class CommonPage {
    @ApiModelProperty("页数")
    private Integer page;
    @ApiModelProperty("条数")
    private Integer size;
    @ApiModelProperty("名称条件")
    private String name;
    @ApiModelProperty("状态")
    private Integer status;
    @ApiModelProperty("用户姓名")
    private String username;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("地址参数")
    private String address;
    @ApiModelProperty("开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date beginTime;
    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
    @ApiModelProperty("系统用户姓名")
    private Date systemName;
    @ApiModelProperty("用户Id")
    private Long userId;
    @ApiModelProperty("参数id")
    private Long paramId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
New file
@@ -0,0 +1,120 @@
package com.panzhihua.common.model.vos.property;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel
public class ComPropertyRepairVO {
    private Integer id;
    /**
     * 报修内容
     */
    @ApiModelProperty(value = "报修内容")
    private String repairContent;
    /**
     * 报修人
     */
    @ApiModelProperty(value = "报修人")
    private String repairName;
    /**
     * 报修手机
     */
    @ApiModelProperty(value = "报修手机")
    private String repairPhone;
    /**
     * 报修位置
     */
    @ApiModelProperty(value = "报修位置")
    private String repairPosition;
    /**
     * 状态 0 待处理 1待评价 2已结束
     */
    @ApiModelProperty(value = "状态 0 待处理 1待评价 2已结束")
    private Integer repairStatus;
    /**
     * 报修时间
     */
    @ApiModelProperty(value = "报修时间")
    private Date createTime;
    /**
     * 报修图片url
     */
    @ApiModelProperty(value = "报修图片url")
    private String repairUrl;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String replyContent;
    /**
     * 评价图片url
     */
    @ApiModelProperty(value = "评价图片url")
    private String replyUrl;
    /**
     * 评价时间
     */
    @ApiModelProperty(value = "评价时间")
    private Date replyTime;
    /**
     * 报修人id
     */
    @ApiModelProperty(value = "报修人id")
    private Long createBy;
    /**
     * 反馈人id
     */
    @ApiModelProperty(value = "反馈人id")
    private Long feedbackBy;
    /**
     * 反馈内容
     */
    @ApiModelProperty(value = "反馈内容")
    private String feedbackContent;
    /**
     * 反馈图片
     */
    @ApiModelProperty(value = "反馈图片")
    private String feedbackUrl;
    /**
     * 反馈时间
     */
    @ApiModelProperty(value = "反馈时间")
    private Date feedbackTime;
    /**
     * 评价星级
     */
    @ApiModelProperty(value = "评价星级")
    private Integer replyScore;
    /**
     * 物业id
     */
    @ApiModelProperty(value = "物业id")
    private Integer propertyId;
    /**
     * 反馈人
     */
    @ApiModelProperty(value = "反馈人名称")
    private String feedback;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
New file
@@ -0,0 +1,56 @@
package com.panzhihua.common.service.property;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
/**
 * 物业接口
 */
@FeignClient(name = "property")
public interface PropertyService {
    /**
     * 分页查询所有数据
     * @return 所有数据
     */
    @PostMapping("/comPropertyRepair/queryAll")
    R comPropertyRepairSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comPropertyRepair/{id}")
    R comPropertyRepairSelectOne(@PathVariable("id") Integer id);
    /**
     * 新增数据
     *
     * @param comPropertyRepair 实体对象
     * @return 新增结果
     */
    @PostMapping("/comPropertyRepair")
    R comPropertyRepairInsert(@RequestBody ComPropertyRepairVO comPropertyRepair);
    /**
     * 修改数据
     *
     * @param comPropertyRepair 实体对象
     * @return 修改结果
     */
    @PostMapping("/comPropertyRepair/update")
    R comPropertyRepairUpdate(@RequestBody ComPropertyRepairVO comPropertyRepair);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comPropertyRepair/del")
    R comPropertyRepairDelete(@RequestParam("id") Long id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java
New file
@@ -0,0 +1,91 @@
package com.panzhihua.community_backstage.api;
import cn.hutool.core.date.DateUtil;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.service.property.PropertyService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Slf4j
@RestController
@RequestMapping("propertyRepair")
@Api(tags = "物业报修api")
public class ComPropertyRepairApi extends BaseController {
    @Resource
    private PropertyService propertyService;
    /**
     * 分页查询所有数据
     * @return 所有数据
     */
    @ApiOperation(value = "后台列表接口",response = ComPropertyRepairVO.class)
    @PostMapping("/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }
    /**
     * 后台添加报修
     * @param comPropertyRepairVO
     * @return
     */
    @ApiOperation("后台添加报修")
    @PostMapping
    public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        comPropertyRepairVO.setCreateTime(DateUtil.date());
        comPropertyRepairVO.setCreateBy(this.getUserId());
        return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
    }
    /**
     * 后台审核接口
     *
     * @param comPropertyRepairVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("审核接口")
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        if(comPropertyRepairVO!=null&& StringUtils.isNotEmpty(comPropertyRepairVO.getFeedbackContent())){
            comPropertyRepairVO.setFeedbackBy(this.getUserId());
            comPropertyRepairVO.setFeedbackTime(DateUtil.date());
        }
        if(comPropertyRepairVO!=null&&StringUtils.isNotEmpty(comPropertyRepairVO.getReplyContent())){
            comPropertyRepairVO.setReplyTime(DateUtil.date());
        }
        return this.propertyService.comPropertyRepairUpdate(comPropertyRepairVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除接口")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.propertyService.comPropertyRepairDelete(id);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情接口")
    @GetMapping("/{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return this.propertyService.comPropertyRepairSelectOne(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/pom.xml
@@ -228,6 +228,8 @@
        <module>service_grid</module>
        <!--网格治理-对接浪潮的市平台综治接口-->
        <module>service_api</module>
        <!--物业service-->
        <module>service_property</module>
    </modules>
    <packaging>pom</packaging>
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
New file
@@ -0,0 +1,92 @@
package com.panzhihua.service_property.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
/**
 * (ComPropertyRepair)表控制层
 *
 * @author makejava
 * @since 2021-09-02 10:12:12
 */
@RestController
@RequestMapping("comPropertyRepair")
public class ComPropertyRepairApi {
    /**
     * 服务对象
     */
    @Resource
    private ComPropertyRepairService comPropertyRepairService;
    /**
     * 分页查询所有数据
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comPropertyRepairService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return R.ok(this.comPropertyRepairService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param comPropertyRepairVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        ComPropertyRepair comPropertyRepair=new ComPropertyRepair();
        if(comPropertyRepairVO!=null){
            BeanUtils.copyProperties(comPropertyRepairVO,comPropertyRepair);
        }
        return R.ok(this.comPropertyRepairService.save(comPropertyRepair));
    }
    /**
     * 修改数据
     *
     * @param comPropertyRepairVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        ComPropertyRepair comPropertyRepair=new ComPropertyRepair();
        if(comPropertyRepairVO!=null){
            BeanUtils.copyProperties(comPropertyRepairVO,comPropertyRepair);
        }
        return R.ok(this.comPropertyRepairService.updateById(comPropertyRepair));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comPropertyRepairService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java
New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_property.dao;
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.property.CommonPage;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
 * (ComPropertyRepair)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-02 10:12:09
 */
@Mapper
public interface ComPropertyRepairDao extends BaseMapper<ComPropertyRepair> {
    IPage<ComPropertyRepairVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java
New file
@@ -0,0 +1,138 @@
package com.panzhihua.service_property.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComPropertyRepair)表实体类
 *
 * @author makejava
 * @since 2021-09-02 10:12:07
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComPropertyRepair implements Serializable {
    private static final long serialVersionUID = 360932817327433044L;
    @TableId(type = IdType.AUTO)
    private Integer id;
    /**
     * 报修内容
     */
    @ApiModelProperty(value = "报修内容")
    private String repairContent;
    /**
     * 报修人
     */
    @ApiModelProperty(value = "报修人")
    private String repairName;
    /**
     * 报修手机
     */
    @ApiModelProperty(value = "报修手机")
    private String repairPhone;
    /**
     * 报修位置
     */
    @ApiModelProperty(value = "报修位置")
    private String repairPosition;
    /**
     * 状态 0 待处理 1待评价 2已结束
     */
    @ApiModelProperty(value = "状态 0 待处理 1待评价 2已结束")
    private Integer repairStatus;
    /**
     * 报修时间
     */
    @ApiModelProperty(value = "报修时间")
    private Date createTime;
    /**
     * 报修图片url
     */
    @ApiModelProperty(value = "报修图片url")
    private String repairUrl;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String replyContent;
    /**
     * 评价图片url
     */
    @ApiModelProperty(value = "评价图片url")
    private String replyUrl;
    /**
     * 评价时间
     */
    @ApiModelProperty(value = "评价时间")
    private Date replyTime;
    /**
     * 报修人id
     */
    @ApiModelProperty(value = "报修人id")
    private Integer createBy;
    /**
     * 反馈人id
     */
    @ApiModelProperty(value = "反馈人id")
    private Integer feedbackBy;
    /**
     * 反馈内容
     */
    @ApiModelProperty(value = "反馈内容")
    private String feedbackContent;
    /**
     * 反馈图片
     */
    @ApiModelProperty(value = "反馈图片")
    private String feedbackUrl;
    /**
     * 反馈时间
     */
    @ApiModelProperty(value = "反馈时间")
    private Date feedbackTime;
    /**
     * 评价星级
     */
    @ApiModelProperty(value = "评价星级")
    private Integer replyScore;
    /**
     * 物业id
     */
    @ApiModelProperty(value = "物业id")
    private Integer propertyId;
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_property.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_property.entity.ComPropertyRepair;
/**
 * (ComPropertyRepair)表服务接口
 *
 * @author makejava
 * @since 2021-09-02 10:12:10
 */
public interface ComPropertyRepairService extends IService<ComPropertyRepair> {
    /**
     * 多条件查询维修列表
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
New file
@@ -0,0 +1,34 @@
package com.panzhihua.service_property.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
 * (ComPropertyRepair)表服务实现类
 *
 * @author makejava
 * @since 2021-09-02 10:12:11
 */
@Slf4j
@Service
public class ComPropertyRepairServiceImpl extends ServiceImpl<ComPropertyRepairDao, ComPropertyRepair> implements ComPropertyRepairService {
    @Resource
    private ComPropertyRepairDao comPropertyRepairDao;
    @Override
    public R pageList(CommonPage commonPage) {
        IPage<ComPropertyRepairVO> list=comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage);
        return R.ok(list);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,43 @@
spring:
  application:
    name: property
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
  servlet:
    multipart:
      max-file-size: 10MB
      max-request-size: 10MB
eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
#实体加密、解密、字段脱敏拦截设置
domain:
  decrypt: true
  encrypt: true
  aesKey: Ryo7M3n8loC5
  sensitive: true
management:
  endpoints:
    web:
      exposure:
        include: '*'
  endpoint:
    health:
      show-details: always
  metrics:
    tags:
      application: property
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/logback-spring.xml
New file
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
    <springProfile name="dev">
        <property name="LOG_HOME" value="F:/log" />
    </springProfile>
       <springProfile name="test">
        <property name="LOG_HOME" value="/mnt/data/gocd/log" />
    </springProfile>
<property name="LOG_HOME" value="/mnt/data/gocd/log" />
    <!-- 控制台输出 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
    </appender>
    <!-- 按照每天生成日志文件 -->
    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--日志文件输出的文件名-->
            <FileNamePattern>${LOG_HOME}/service_property.log.%d{yyyy-MM-dd}.log</FileNamePattern>
            <!--日志文件保留天数-->
            <MaxHistory>30</MaxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
        <!--日志文件最大的大小-->
        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
            <MaxFileSize>10MB</MaxFileSize>
        </triggeringPolicy>
    </appender>
    <!--myibatis log configure-->
    <logger name="com.apache.ibatis" level="TRACE"/>
    <logger name="java.sql.Connection" level="DEBUG"/>
    <logger name="java.sql.Statement" level="DEBUG"/>
    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
    <logger name="com.panzhihua.service_property" level="DEBUG"/>
    <!-- 日志输出级别 -->
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
    </root>
    <root level="INFO">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </root>
</configuration>
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml
New file
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_property.dao.ComPropertyRepairDao">
    <resultMap type="com.panzhihua.service_property.entity.ComPropertyRepair" id="ComPropertyRepairBaseResultMap">
        <result property="id" column="id"/>
        <result property="repairContent" column="repair_content"/>
        <result property="repairName" column="repair_name"/>
        <result property="repairPhone" column="repair_phone"/>
        <result property="repairPosition" column="repair_position"/>
        <result property="repairStatus" column="repair_status"/>
        <result property="createTime" column="create_time"/>
        <result property="repairUrl" column="repair_url"/>
        <result property="replyContent" column="reply_content"/>
        <result property="replyUrl" column="reply_url"/>
        <result property="replyTime" column="reply_time"/>
        <result property="createBy" column="create_by"/>
        <result property="feedbackBy" column="feedback_by"/>
        <result property="feedbackContent" column="feedback_content"/>
        <result property="feedbackUrl" column="feedback_url"/>
        <result property="feedbackTime" column="feedback_time"/>
        <result property="replyScore" column="reply_score"/>
        <result property="propertyId" column="property_id"/>
    </resultMap>
    <select id="pageList" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO" parameterType="com.panzhihua.common.model.dtos.property.CommonPage">
        select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id
        <where>
            1=1
            <if test="commonPage.status !=null">
                and t.repair_status =#{commonPage.status}
            </if>
            <if test="commonPage.username !=null and commonPage.username.trim() !=''">
                and t.repair_name  like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.phone !=null and commonPage.phone.trim() !=''">
                and t.repair_phone like concat(#{commonPage.phone},'%')
            </if>
            <if test="commonPage.address !=null and commonPage.address.trim() !=''">
                and t.repair_position like  concat(#{commonPage.address},'%')
            </if>
            <if test="commonPage.beginTime !=null">
                and t.create_time >=#{commonPage.beginTime}
            </if>
            <if test="commonPage.endTime !=null">
                and #{commonPage.endTime} >=t.create_time
            </if>
            <if test="commonPage.systemName !=null and commonPage.systemName.trim() !=''">
                and t1.name like concat(#{commonPage.systemName},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and t.property_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.userId !=null">
                and t.create_by =#{commonPage.userId}
            </if>
        </where>
    </select>
</mapper>