Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-22 245eb51063dca6bcb9c67c5b4b400b6f2b04453a

Merge remote-tracking branch 'origin/test' into test

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

New file
@@ -0,0 +1,97 @@
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.community.ComPropertyVO;
import com.panzhihua.common.model.vos.property.ComPropertyHelpVO;
import com.panzhihua.common.service.property.PropertyService;
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;
import java.io.Serializable;

/**
 * (ComPropertyHelp)表控制层
 *
 * @author makejava
 * @since 2021-09-18 16:43:12
 */
@Slf4j
@Api(tags = {"一件求助人员"})
@RestController
@RequestMapping("/comPropertyHelp")
public class ComPropertyHelpApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private PropertyService propertyService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.propertyService.comPropertyHelpSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "主键查询")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return this.propertyService.comPropertyHelpSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comPropertyHelp 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        comPropertyHelp.setCommunityId(this.getCommunityId());
        comPropertyHelp.setCreateTime(DateUtil.date());
        return this.propertyService.comPropertyHelpInsert(comPropertyHelp);
    }

    /**
     * 修改数据
     *
     * @param comPropertyHelp 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        return this.propertyService.comPropertyHelpUpdate(comPropertyHelp);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.propertyService.comPropertyHelpDelete(id);
    }
}

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

@@ -197,4 +197,16 @@
        return R.ok(loginReturnVO);
    }

    /**
     * 一键报警APP登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginAlarmApp")
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
        return R.ok(loginReturnVO);
    }

}

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

@@ -103,4 +103,15 @@
     * @return  登录结果
     */
    LoginReturnVO loginCgBackage(String account, String password);

    /**
     * 一键报警APP登录
     *
     * @param account
     *            账户
     * @param password
     *            密码
     * @return 登录结果
     */
    LoginReturnsVO loginAlarmApp(String account, String password);
}

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

@@ -223,4 +223,20 @@
        return loginReturnVO;
    }

    @Override
    public LoginReturnsVO loginAlarmApp(String account, String password) {
        Authentication authentication = null;
        authentication =
                authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnsVO loginReturnVO = new LoginReturnsVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setUserId(loginUser.getUserId());
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        return loginReturnVO;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -7,6 +7,9 @@

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel
public class CommonPage {
@@ -46,4 +49,6 @@
    private Date statusEndTime;
    @ApiModelProperty("编号")
    private String serialNo;
    @ApiModelProperty("小区id")
    private Long areaId;
}

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

@@ -19,4 +19,6 @@
    private String refreshToken;
    @ApiModelProperty("用户id")
    private Long userId;
    @ApiModelProperty("社区id")
    private Long communityId;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("业主委员会实体")
public class ComActCommiteeVO {
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 联系人
     */
    @ApiModelProperty(value = "联系人")
    private String contactName;

    /**
     * 联系电话
     */
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /**
     * 小区id
     */
    @ApiModelProperty(value = "小区id")
    private Long areaId;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 社区id
     */
    private Long communityId;

    @ApiModelProperty("账号")
    private String account;

    @ApiModelProperty("密码")
    private String password;

    @ApiModelProperty("权限id")
    private Long roleId;

    @ApiModelProperty("小区名称")
    private String areaName;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel("社会组织实体参数")
public class ComActSocialOrgVO {
    /**
     * ID
     */
    @ApiModelProperty(value = "ID")
    private Long id;

    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;

    /**
     * 工商登记号
     */
    @ApiModelProperty(value = "工商登记号")
    private String businessNumber;

    /**
     * 成立时间
     */
    @ApiModelProperty(value = "成立时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date buildDate;

    /**
     * 机构代码
     */
    @ApiModelProperty(value = "机构代码")
    private String agencyCode;

    /**
     * 微信公众号
     */
    @ApiModelProperty(value = "微信公众号")
    private String weixinOfficialAccounts;

    /**
     * 单位类别： 1 社会团体、2 民办非企业单位、3 基金会
     */
    @ApiModelProperty(value = "单位类别： 1 社会团体、2 民办非企业单位、3 基金会")
    private Integer companyType;

    /**
     * 注册资金（万元）
     */
    @ApiModelProperty(value = "注册资金（万元）")
    private Integer registFee;

    /**
     * 资产总额（万元）
     */
    @ApiModelProperty(value = "资产总额（万元）")
    private Integer assetsTotal;

    /**
     * 净资产（万元）
     */
    @ApiModelProperty(value = "净资产（万元）")
    private Integer assetsNet;

    /**
     * 销售额（万元）
     */
    @ApiModelProperty(value = "销售额（万元）")
    private Double salesFee;

    /**
     * 上年纳税额（万元）
     */
    @ApiModelProperty(value = "上年纳税额（万元）")
    private Double taxesLastYear;

    /**
     * 职工人数（人）
     */
    @ApiModelProperty(value = "职工人数（人）")
    private Integer staffCount;

    /**
     * 通讯地址
     */
    @ApiModelProperty(value = "通讯地址")
    private String maillingAddr;

    /**
     * 邮编
     */
    @ApiModelProperty(value = "邮编")
    private String postCode;

    /**
     * 官方网址
     */
    @ApiModelProperty(value = "官方网址")
    private String officialUrl;

    /**
     * 法人姓名
     */
    @ApiModelProperty(value = "法人姓名")
    private String corporationName;

    /**
     * 法人性别0女1男
     */
    @ApiModelProperty(value = "法人性别0女1男")
    private String corporationGen;

    /**
     * 法人工作电话
     */
    @ApiModelProperty(value = "法人工作电话")
    private String corporationOfficePhone;

    /**
     * 法人职位
     */
    @ApiModelProperty(value = "法人职位")
    private String corporationPosition;

    /**
     * 法人手机
     */
    @ApiModelProperty(value = "法人手机")
    private String corporationPhone;

    /**
     * 法人邮箱
     */
    @ApiModelProperty(value = "法人邮箱")
    private String corporationEmail;

    /**
     * 联系人姓名
     */
    @ApiModelProperty(value = "联系人姓名")
    private String contactName;

    /**
     * 联系人性别0女1男
     */
    @ApiModelProperty(value = "联系人性别0女1男")
    private String contactGen;

    /**
     * 联系人工作电话
     */
    @ApiModelProperty(value = "联系人工作电话")
    private String contactOfficePhone;

    /**
     * 联系人职位
     */
    @ApiModelProperty(value = "联系人职位")
    private String contactPosition;

    /**
     * 联系人手机
     */
    @ApiModelProperty(value = "联系人手机")
    private String contactPhone;

    /**
     * 联系人邮箱
     */
    @ApiModelProperty(value = "联系人邮箱")
    private String contactEmail;

    /**
     * 业务范围/专业领域
     */
    @ApiModelProperty(value = "业务范围/专业领域")
    private String businessScope;

    /**
     * 运营情况及行业影响（含所获荣誉）
     */
    @ApiModelProperty(value = "运营情况及行业影响（含所获荣誉）")
    private String businessImpact;

    /**
     * 附件（以逗号隔开）
     */
    @ApiModelProperty(value = "附件（以逗号隔开）")
    private String attachUrl;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateAt;

    private Long communityId;

    /**
     * 登录用户id
     */
    @ApiModelProperty(value = "登录用户id")
    private Long userId;

    @ApiModelProperty("账号")
    private String account;

    @ApiModelProperty("密码")
    private String password;

    @ApiModelProperty("权限id")
    private Long roleId;
}

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

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

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

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel("物业公司实体")
public class ComPropertyVO {
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 简介
     */
    @ApiModelProperty(value = "简介")
    private String introduction;

    /**
     * 联系人姓名
     */
    @ApiModelProperty(value = "联系人姓名")
    private String contactName;

    /**
     * 联系人手机
     */
    @ApiModelProperty(value = "联系人手机")
    private String phone;

    /**
     * 地址
     */
    @ApiModelProperty(value = "地址")
    private String address;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

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

    @ApiModelProperty("账号")
    private String account;

    @ApiModelProperty("密码")
    private String password;

    @ApiModelProperty("权限id")
    private Long roleId;

    @ApiModelProperty("创建时间")
    private Date createTime;

    @ApiModelProperty("小区名称")
    private String areaName;

    @ApiModelProperty("小区id")
    private Long areaId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.property;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,6 +28,7 @@
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    /**
     * 位置信息
@@ -62,6 +64,7 @@
     * 处理时间
     */
    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date solveTime;

    /**
@@ -87,4 +90,16 @@
     */
    @ApiModelProperty("处理图片")
    private String solveUrl;

    /**
     * 经度
     */
    @ApiModelProperty("经度")
    private String longitude;

    /**
     * 纬度
     */
    @ApiModelProperty("纬度")
    private String latitude;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java

@@ -64,4 +64,10 @@
     */
    @ApiModelProperty(value = "设备类型 1红外报警 2一键报警 ")
    private Integer type;

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "街路巷id")
    private Long villageId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyHelpVO.java

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

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

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel("一件求助人员实体")
public class ComPropertyHelpVO {
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private Integer id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String imgUrl;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 状态 0 禁用 1启用
     */
    @ApiModelProperty(value = "状态 0 禁用 1启用")
    private Integer status;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java

@@ -112,4 +112,13 @@
     */
    @PostMapping("/loginCgBackage")
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 一键报警APP登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginAlarmApp")
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);
}

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

@@ -4,6 +4,7 @@

import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
@@ -5926,4 +5927,108 @@
     */
    @PostMapping("/elders/pension/auth/header/statistic")
    R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialOrg/queryAll")
    R comActSocialOrgSelectAll(CommonPage commonPage);

    /**
     * 新增数据
     *
     * @param comActSocialOrg 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialOrg")
    R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);

    /**
     * 修改数据
     *
     * @param comActSocialOrg 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialOrg/update")
    R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialOrg/del")
    R comActSocialOrgDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActCommittee/queryAll")
    R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 新增数据
     *
     * @param comActCommittee 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActCommittee")
    R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
    /**
     * 修改数据
     *
     * @param comActCommittee 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActCommittee/update")
    R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActCommittee/del")
    R comActCommitteeDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comProperty/queryAll")
    R comPropertySelectAll(@RequestBody CommonPage commonPage);
    /**
     * 新增数据
     *
     * @param comPropertyVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comProperty")
    R comPropertyInsert(@RequestBody ComPropertyVO comPropertyVO);
    /**
     * 修改数据
     *
     * @param comPropertyVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comProperty/update")
    R comPropertyUpdate(@RequestBody ComPropertyVO comPropertyVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comProperty/del")
    R comPropertyDelete(@RequestParam("id") Long id);
}

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

@@ -2,12 +2,11 @@

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmSettingVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.model.vos.property.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

import java.io.Serializable;

/**
 * 物业接口
@@ -162,4 +161,49 @@
     */
    @GetMapping("/comPropertyAlarmSetting")
    R comPropertyAlarmSettingSelectOne(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comPropertyHelp/queryAll")
    R comPropertyHelpSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comPropertyHelp/{id}")
    R comPropertyHelpSelectOne(@PathVariable("id") Serializable id);

    /**
     * 新增数据
     *
     * @param comPropertyHelp 实体对象
     * @return 新增结果
     */
    @PostMapping("/comPropertyHelp")
    R comPropertyHelpInsert(@RequestBody ComPropertyHelpVO comPropertyHelp);

    /**
     * 修改数据
     *
     * @param comPropertyHelp 实体对象
     * @return 修改结果
     */
    @PostMapping("/comPropertyHelp/update")
    R comPropertyHelpUpdate(@RequestBody ComPropertyHelpVO comPropertyHelp);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comPropertyHelp/del")
    R comPropertyHelpDelete(@RequestParam("id") Long id);
}

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

@@ -127,6 +127,16 @@
    R changePassword(@RequestBody ChangePasswordVO changePasswordVO);

    /**
     * 重置密码用户登录密码默认admin123456
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPassword")
    R resetPassword(@RequestParam("userId") Long userId);

    /**
     * 某社区后台人员查询
     * 
     * @param param
@@ -312,6 +322,16 @@
    R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 新增社区后台物业，社会组织，业主委员会账户
     *
     * @param administratorsUserVO
     *            账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstageproperty")
    R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营、社区后台账户
     * 
     * @param administratorsUserVO

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

New file
@@ -0,0 +1,75 @@
package com.panzhihua.community_backstage.api;

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.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.service.community.CommunityService;
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;

/**
 * @author zzj
 */
@Slf4j
@Api(tags = {"业主委员会"})
@RestController
@RequestMapping("/comActCommittee")
public class ComActCommitteeApi extends BaseController {
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "业主委员会列表",response = ComActCommiteeVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comActCommitteeSelectAll(commonPage);
    }
    /**
     * 新增数据
     *
     * @param comActCommiteeVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增业主委员会")
    @PostMapping
    public R insert(@RequestBody ComActCommiteeVO comActCommiteeVO) {
        comActCommiteeVO.setCommunityId(this.getCommunityId());
        return this.communityService.comActCommitteeInsert(comActCommiteeVO);
    }

    /**
     * 修改数据
     *
     * @param comActCommiteeVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改业主委员会")
    @PostMapping("/update")
    public R update(@RequestBody ComActCommiteeVO comActCommiteeVO) {
        return this.communityService.comActCommitteeUpdate(comActCommiteeVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除业主委员会")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActCommitteeDelete(id);
    }
}

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

New file
@@ -0,0 +1,74 @@
package com.panzhihua.community_backstage.api;

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.community.ComActSocialOrgVO;
import com.panzhihua.common.service.community.CommunityService;
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;

/**
 * @author zzj
 */
@Slf4j
@Api(tags = {"社会组织"})
@RestController
@RequestMapping("/comActSocialOrg")
public class ComActSocialOrgApi extends BaseController {
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comActSocialOrgSelectAll(commonPage);
    }
    /**
     * 新增数据
     *
     * @param comActSocialOrg 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增社会组织")
    @PostMapping
    public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        comActSocialOrg.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialOrgInsert(comActSocialOrg);
    }

    /**
     * 修改数据
     *
     * @param comActSocialOrg 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改社会组织")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        return this.communityService.comActSocialOrgUpdate(comActSocialOrg);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除社会组织")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActSocialOrgDelete(id);
    }
}

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

@@ -1,24 +1,35 @@
package com.panzhihua.community_backstage.api;

import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.service.property.PropertyService;
import com.panzhihua.community_backstage.util.MyAESUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;

@Slf4j
@RestController
@RequestMapping("comPropertyAlarm")
@Api(tags = "物业报警api")
public class ComPropertyAlarmApi extends BaseController {
    private static final String key="nahankeji1234567";

    @Resource
    private PropertyService propertyService;

@@ -28,7 +39,7 @@
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComPropertyAlarmVO.class)
    @PostMapping("queryAll/noToken")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(2L);
        return propertyService.comPropertyAlarmSelectAll(commonPage);
@@ -59,6 +70,32 @@
        return propertyService.comPropertyAlarmInsert(comPropertyAlarmVO);
    }

//    /**
//     * 无验证新增数据
//     *
//     * @param str 加密json
//     * @return 新增结果
//     */
//    @ApiOperation(value = "无验证新增数据")
//    @GetMapping("/noToken")
//    public R insertNoAuth(String str) {
//        if(!str.isEmpty()){
//            try {
//                String result= MyAESUtil.Decrypt(str.replaceAll(" ", "+"), key);
//                if(!result.isEmpty()){
//                    ComPropertyAlarmVO comPropertyAlarmVO=JSON.parseObject(result,ComPropertyAlarmVO.class);
//                    if(comPropertyAlarmVO!=null){
//                        return propertyService.comPropertyAlarmInsert(comPropertyAlarmVO);
//                    }
//                }
//            } catch (Exception e) {
//                return R.fail("验证失败");
//            }
//
//        }
//        return R.fail("数据异常");
//    }

    /**
     * 修改数据
     *

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

New file
@@ -0,0 +1,75 @@
package com.panzhihua.community_backstage.api;

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.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
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;

/**
 * @author zzj
 */
@Slf4j
@Api(tags = {"物业公司"})
@RestController
@RequestMapping("/comProperty")
public class ComPropertyApi extends BaseController {
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comPropertySelectAll(commonPage);
    }
    /**
     * 新增数据
     *
     * @param comPropertyVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增物业公司")
    @PostMapping
    public R insert(@RequestBody ComPropertyVO comPropertyVO) {
        comPropertyVO.setCommunityId(this.getCommunityId());
        return this.communityService.comPropertyInsert(comPropertyVO);
    }

    /**
     * 修改数据
     *
     * @param comPropertyVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改物业公司")
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyVO comPropertyVO) {
        return this.communityService.comPropertyUpdate(comPropertyVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除物业公司")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comPropertyDelete(id);
    }
}

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

New file
@@ -0,0 +1,97 @@
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.community.ComPropertyVO;
import com.panzhihua.common.model.vos.property.ComPropertyHelpVO;
import com.panzhihua.common.service.property.PropertyService;
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;
import java.io.Serializable;

/**
 * (ComPropertyHelp)表控制层
 *
 * @author makejava
 * @since 2021-09-18 16:43:12
 */
@Slf4j
@Api(tags = {"一件求助人员"})
@RestController
@RequestMapping("/comPropertyHelp")
public class ComPropertyHelpApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private PropertyService propertyService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.propertyService.comPropertyHelpSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "主键查询")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return this.propertyService.comPropertyHelpSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comPropertyHelp 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        comPropertyHelp.setCommunityId(this.getCommunityId());
        comPropertyHelp.setCreateTime(DateUtil.date());
        return this.propertyService.comPropertyHelpInsert(comPropertyHelp);
    }

    /**
     * 修改数据
     *
     * @param comPropertyHelp 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        return this.propertyService.comPropertyHelpUpdate(comPropertyHelp);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.propertyService.comPropertyHelpDelete(id);
    }
}

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

@@ -29,6 +29,8 @@
    @ApiOperation(value = "后台列表接口",response = ComPropertyRepairVO.class)
    @PostMapping("/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        //commonPage.setAreaId(this.getAreaId());
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }


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

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.LoginReturnsVO;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

@@ -73,5 +74,18 @@
        R r = tokenService.loginCgBackage(account, password);
        return r;
    }
    @ApiOperation(value = "一键报警APP登录",response = LoginReturnsVO.class)
    @PostMapping("alarm/login")
    public  R alarmLogin(@RequestBody LoginBody loginBody){
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginAlarmApp(account, password);
        return r;
    }

}

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

@@ -48,6 +48,12 @@
        return userService.changePassword(changePasswordVO);
    }

    @ApiOperation("重置密码")
    @GetMapping("resetPassword")
    public R resetPassword(@RequestParam("userId") Long userId){
        return userService.resetPassword(userId);
    }

    @ApiOperation(value = "用户菜单获取", response = SysMenuVO.class)
    @GetMapping("listmenu")
    public R listmenu() {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.community_backstage.util;

import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;

import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;

public class MyAESUtil {

    // 加密
    public static String Encrypt(String sSrc, String sKey) throws Exception {
        if (sKey == null) {
            System.out.print("Key为空null");
            return null;
        }
        // 判断Key是否为16位
        if (sKey.length() != 16) {
            System.out.print("Key长度不是16位");
            return null;
        }
        byte[] raw = sKey.getBytes("utf-8");
        SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
        Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式"
        cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
        byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
        return new BASE64Encoder().encode(encrypted);//此处使用BASE64做转码功能，同时能起到2次加密的作用。
    }

    // 解密
    public static String Decrypt(String sSrc, String sKey) throws Exception {
        try {
            // 判断Key是否正确
            if (sKey == null) {
                System.out.print("Key为空null");
                return null;
            }
            // 判断Key是否为16位
            if (sKey.length() != 16) {
                System.out.print("Key长度不是16位");
                return null;
            }
            byte[] raw = sKey.getBytes("utf-8");
            SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
            cipher.init(Cipher.DECRYPT_MODE, skeySpec);
            byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc);//先用base64解密
            try {
                byte[] original = cipher.doFinal(encrypted1);
                String originalString = new String(original,"utf-8");
                return originalString;
            } catch (Exception e) {
                System.out.println(e.toString());
                return null;
            }
        } catch (Exception ex) {
            System.out.println(ex.toString());
            return null;
        }
    }
}

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

New file
@@ -0,0 +1,87 @@
package com.panzhihua.service_community.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
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.community.ComActCommiteeVO;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.service.ComActCommitteeService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (ComActCommittee)表控制层
 *
 * @author makejava
 * @since 2021-09-17 13:55:44
 */
@RestController
@RequestMapping("comActCommittee")
public class ComActCommitteeApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActCommitteeService comActCommitteeService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActCommitteeService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.comActCommitteeService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comActCommittee 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActCommiteeVO comActCommittee) {
        return this.comActCommitteeService.insert(comActCommittee);
    }

    /**
     * 修改数据
     *
     * @param comActCommittee 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActCommiteeVO comActCommittee) {
        return this.comActCommitteeService.update(comActCommittee);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.comActCommitteeService.delete(id);
    }
}

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

New file
@@ -0,0 +1,75 @@
package com.panzhihua.service_community.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
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.community.ComActSocialOrgVO;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.service.ComActSocialOrgService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * 社会组织(ComActSocialOrg)表控制层
 *
 * @author makejava
 * @since 2021-09-17 10:45:31
 */
@RestController
@RequestMapping("comActSocialOrg")
public class ComActSocialOrgApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialOrgService comActSocialOrgService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialOrgService.pageList(commonPage);
    }
    /**
     * 新增数据
     *
     * @param comActSocialOrg 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        return this.comActSocialOrgService.insert(comActSocialOrg);
    }

    /**
     * 修改数据
     *
     * @param comActSocialOrg 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        return this.comActSocialOrgService.update(comActSocialOrg);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.comActSocialOrgService.delete(id);
    }
}

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

New file
@@ -0,0 +1,76 @@
package com.panzhihua.service_community.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.service_community.entity.ComProperty;
import com.panzhihua.service_community.service.ComPropertyService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (ComProperty)表控制层
 *
 * @author makejava
 * @since 2021-09-18 10:46:52
 */
@RestController
@RequestMapping("comProperty")
public class ComPropertyApi {
    /**
     * 服务对象
     */
    @Resource
    private ComPropertyService comPropertyService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comPropertyService.pageList(commonPage);
    }

    /**
     * 新增数据
     *
     * @param comProperty 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComPropertyVO comProperty) {
        return this.comPropertyService.insert(comProperty);
    }

    /**
     * 修改数据
     *
     * @param comProperty 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyVO comProperty) {
        return this.comPropertyService.update(comProperty);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.comPropertyService.delete(id);
    }
}

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

New file
@@ -0,0 +1,28 @@
package com.panzhihua.service_community.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.community.ComActCommiteeVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActCommittee;
import org.apache.ibatis.annotations.Param;

/**
 * (ComActCommittee)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-17 13:55:43
 */
@Mapper
public interface ComActCommitteeDao extends BaseMapper<ComActCommittee> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActCommiteeVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

}

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

New file
@@ -0,0 +1,27 @@
package com.panzhihua.service_community.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.community.ComActSocialOrgVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import org.apache.ibatis.annotations.Param;

/**
 * 社会组织(ComActSocialOrg)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-17 10:45:30
 */
@Mapper
public interface ComActSocialOrgDao extends BaseMapper<ComActSocialOrg> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActSocialOrgVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
}

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

New file
@@ -0,0 +1,28 @@
package com.panzhihua.service_community.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.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;

/**
 * (ComProperty)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-18 10:46:51
 */
@Mapper
public interface ComPropertyDao extends BaseMapper<ComProperty> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComPropertyVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
}

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

New file
@@ -0,0 +1,76 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
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;


/**
 * (ComActCommittee)表实体类
 *
 * @author makejava
 * @since 2021-09-17 13:55:43
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComActCommittee implements Serializable {

    private static final long serialVersionUID = -95815418574862374L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 联系人
     */
    @ApiModelProperty(value = "联系人")
    private String contactName;

    /**
     * 联系电话
     */
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /**
     * 小区id
     */
    @ApiModelProperty(value = "小区id")
    private Long areaId;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

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

}

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

New file
@@ -0,0 +1,252 @@
package com.panzhihua.service_community.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;


/**
 * 社会组织(ComActSocialOrg)表实体类
 *
 * @author makejava
 * @since 2021-09-17 10:45:21
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社会组织")
public class ComActSocialOrg implements Serializable {

    private static final long serialVersionUID = 597028379524285428L;

    /**
     * ID
     */
    @ApiModelProperty(value = "ID")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;

    /**
     * 工商登记号
     */
    @ApiModelProperty(value = "工商登记号")
    private String businessNumber;

    /**
     * 成立时间
     */
    @ApiModelProperty(value = "成立时间")
    private Date buildDate;

    /**
     * 机构代码
     */
    @ApiModelProperty(value = "机构代码")
    private String agencyCode;

    /**
     * 微信公众号
     */
    @ApiModelProperty(value = "微信公众号")
    private String weixinOfficialAccounts;

    /**
     * 单位类别： 1 社会团体、2 民办非企业单位、3 基金会
     */
    @ApiModelProperty(value = "单位类别： 1 社会团体、2 民办非企业单位、3 基金会")
    private Integer companyType;

    /**
     * 注册资金（万元）
     */
    @ApiModelProperty(value = "注册资金（万元）")
    private Integer registFee;

    /**
     * 资产总额（万元）
     */
    @ApiModelProperty(value = "资产总额（万元）")
    private Integer assetsTotal;

    /**
     * 净资产（万元）
     */
    @ApiModelProperty(value = "净资产（万元）")
    private Integer assetsNet;

    /**
     * 销售额（万元）
     */
    @ApiModelProperty(value = "销售额（万元）")
    private Double salesFee;

    /**
     * 上年纳税额（万元）
     */
    @ApiModelProperty(value = "上年纳税额（万元）")
    private Double taxesLastYear;

    /**
     * 职工人数（人）
     */
    @ApiModelProperty(value = "职工人数（人）")
    private Integer staffCount;

    /**
     * 通讯地址
     */
    @ApiModelProperty(value = "通讯地址")
    private String maillingAddr;

    /**
     * 邮编
     */
    @ApiModelProperty(value = "邮编")
    private String postCode;

    /**
     * 官方网址
     */
    @ApiModelProperty(value = "官方网址")
    private String officialUrl;

    /**
     * 法人姓名
     */
    @ApiModelProperty(value = "法人姓名")
    private String corporationName;

    /**
     * 法人性别0女1男
     */
    @ApiModelProperty(value = "法人性别0女1男")
    private String corporationGen;

    /**
     * 法人工作电话
     */
    @ApiModelProperty(value = "法人工作电话")
    private String corporationOfficePhone;

    /**
     * 法人职位
     */
    @ApiModelProperty(value = "法人职位")
    private String corporationPosition;

    /**
     * 法人手机
     */
    @ApiModelProperty(value = "法人手机")
    private String corporationPhone;

    /**
     * 法人邮箱
     */
    @ApiModelProperty(value = "法人邮箱")
    private String corporationEmail;

    /**
     * 联系人姓名
     */
    @ApiModelProperty(value = "联系人姓名")
    private String contactName;

    /**
     * 联系人性别0女1男
     */
    @ApiModelProperty(value = "联系人性别0女1男")
    private String contactGen;

    /**
     * 联系人工作电话
     */
    @ApiModelProperty(value = "联系人工作电话")
    private String contactOfficePhone;

    /**
     * 联系人职位
     */
    @ApiModelProperty(value = "联系人职位")
    private String contactPosition;

    /**
     * 联系人手机
     */
    @ApiModelProperty(value = "联系人手机")
    private String contactPhone;

    /**
     * 联系人邮箱
     */
    @ApiModelProperty(value = "联系人邮箱")
    private String contactEmail;

    /**
     * 业务范围/专业领域
     */
    @ApiModelProperty(value = "业务范围/专业领域")
    private String businessScope;

    /**
     * 运营情况及行业影响（含所获荣誉）
     */
    @ApiModelProperty(value = "运营情况及行业影响（含所获荣誉）")
    private String businessImpact;

    /**
     * 附件（以逗号隔开）
     */
    @ApiModelProperty(value = "附件（以逗号隔开）")
    private String attachUrl;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createAt;

    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateAt;

    private Long communityId;

    /**
     * 登录用户id
     */
    @ApiModelProperty(value = "登录用户id")
    private Long userId;

}

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

New file
@@ -0,0 +1,84 @@
package com.panzhihua.service_community.entity;

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;


/**
 * (ComProperty)表实体类
 *
 * @author makejava
 * @since 2021-09-18 10:46:50
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComProperty implements Serializable {

    private static final long serialVersionUID = 860578600976051156L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 简介
     */
    @ApiModelProperty(value = "简介")
    private String introduction;

    /**
     * 联系人姓名
     */
    @ApiModelProperty(value = "联系人姓名")
    private String contactName;

    /**
     * 联系人手机
     */
    @ApiModelProperty(value = "联系人手机")
    private String phone;

    /**
     * 地址
     */
    @ApiModelProperty(value = "地址")
    private String address;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

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

    private Date createTime;

    private Long areaId;

}

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

New file
@@ -0,0 +1,45 @@
package com.panzhihua.service_community.service;

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.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.service_community.entity.ComActCommittee;

/**
 * (ComActCommittee)表服务接口
 *
 * @author makejava
 * @since 2021-09-17 13:55:44
 */
public interface ComActCommitteeService extends IService<ComActCommittee> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);


    /**
     * 新增
     * @param comActCommiteeVO
     * @return
     */
    R insert(ComActCommiteeVO comActCommiteeVO);

    /**
     * 更新
     * @param comActCommiteeVO
     * @return
     */
    R update(ComActCommiteeVO comActCommiteeVO);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}

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

New file
@@ -0,0 +1,50 @@
package com.panzhihua.service_community.service;

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.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.service_community.entity.ComActSocialOrg;

/**
 * 社会组织(ComActSocialOrg)表服务接口
 *
 * @author makejava
 * @since 2021-09-17 10:45:30
 */
public interface ComActSocialOrgService extends IService<ComActSocialOrg> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * id查询详情
     * @param id
     * @return
     */
    R selectById(Long id);

    /**
     * 新增
     * @param comActSocialOrgVO
     * @return
     */
    R insert(ComActSocialOrgVO comActSocialOrgVO);

    /**
     * 更新
     * @param comActSocialOrgVO
     * @return
     */
    R update(ComActSocialOrgVO comActSocialOrgVO);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}

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

New file
@@ -0,0 +1,51 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.service_community.entity.ComProperty;

/**
 * (ComProperty)表服务接口
 *
 * @author makejava
 * @since 2021-09-18 10:46:51
 */
public interface ComPropertyService extends IService<ComProperty> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * id查询详情
     * @param id
     * @return
     */
    R selectById(Long id);

    /**
     * 新增
     * @param comPropertyVO
     * @return
     */
    R insert(ComPropertyVO comPropertyVO);

    /**
     * 更新
     * @param comPropertyVO
     * @return
     */
    R update(ComPropertyVO comPropertyVO);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}

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

New file
@@ -0,0 +1,95 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
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.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.dao.ComActCommitteeDao;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.service.ComActCommitteeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

/**
 * (ComActCommittee)表服务实现类
 *
 * @author makejava
 * @since 2021-09-17 13:55:44
 */
@Slf4j
@Service
public class ComActCommitteeServiceImpl extends ServiceImpl<ComActCommitteeDao, ComActCommittee> implements ComActCommitteeService {
    @Resource
    private ComActCommitteeDao comActCommitteeDao;
    @Resource
    private UserService userService;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActCommitteeDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insert(ComActCommiteeVO comActCommiteeVO) {
        if(comActCommiteeVO!=null){
            ComActCommittee comActCommittee=new ComActCommittee();
            BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
            administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
            administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
            administratorsUserVO.setCommunityId(comActCommiteeVO.getCommunityId());
            administratorsUserVO.setAreaId(comActCommiteeVO.getAreaId());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comActCommittee.setUserId(Long.parseLong(r.getData().toString()));
                comActCommittee.setCreateTime(DateUtil.date());
                this.comActCommitteeDao.insert(comActCommittee);
                return R.ok();
            }
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R update(ComActCommiteeVO comActCommiteeVO) {
        if(comActCommiteeVO!=null){
                ComActCommittee comActCommittee=new ComActCommittee();
                BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
                this.comActCommitteeDao.updateById(comActCommittee);
                return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R delete(Long id) {
        ComActCommittee comActCommittee=comActCommitteeDao.selectById(id);
        if(comActCommittee!=null){
            if(comActCommittee.getUserId()!=null){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActCommittee.getUserId());
                administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActCommitteeDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
            }
        }
        return R.fail("用户账号错误");
    }
}

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

New file
@@ -0,0 +1,97 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
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.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.service.ComActSocialOrgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

/**
 * 社会组织(ComActSocialOrg)表服务实现类
 *
 * @author makejava
 * @since 2021-09-17 10:45:30
 */
@Slf4j
@Service
public class ComActSocialOrgServiceImpl extends ServiceImpl<ComActSocialOrgDao, ComActSocialOrg> implements ComActSocialOrgService {
@Resource
private ComActSocialOrgDao comActSocialOrgDao;
@Resource
private UserService userService;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActSocialOrgDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R selectById(Long id) {
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insert(ComActSocialOrgVO comActSocialOrgVO) {
        if(comActSocialOrgVO!=null){
            ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
            BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comActSocialOrg.setUserId(Long.parseLong(r.getData().toString()));
                comActSocialOrg.setCreateAt(DateUtil.date());
                this.comActSocialOrgDao.insert(comActSocialOrg);
                return R.ok();
            }
        }
        return R.fail();
    }

    @Override
    public R update(ComActSocialOrgVO comActSocialOrgVO) {
        if(comActSocialOrgVO!=null){
               ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
               BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
               this.comActSocialOrgDao.updateById(comActSocialOrg);
               return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R delete(Long id) {
        ComActSocialOrg comActSocialOrg=comActSocialOrgDao.selectById(id);
        if(comActSocialOrg!=null){
            if(comActSocialOrg.getUserId()!=null){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActSocialOrg.getUserId());
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActSocialOrgDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
            }
        }
        return R.fail("用户账号错误");
    }
}

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

New file
@@ -0,0 +1,98 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
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.community.ComPropertyVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.entity.ComProperty;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.service.ComPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

/**
 * (ComProperty)表服务实现类
 *
 * @author makejava
 * @since 2021-09-18 10:46:51
 */
@Slf4j
@Service
public class ComPropertyServiceImpl extends ServiceImpl<ComPropertyDao, ComProperty> implements ComPropertyService {
    @Resource
    private ComPropertyDao comPropertyDao;
    @Resource
    private UserService userService;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comPropertyDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R selectById(Long id) {
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insert(ComPropertyVO comPropertyVO) {
        if(comPropertyVO!=null){
            ComProperty comProperty=new ComProperty();
            BeanUtils.copyProperties(comPropertyVO,comProperty);
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comPropertyVO.getAccount());
            administratorsUserVO.setPassword(comPropertyVO.getPassword());
            administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
            administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
            administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comProperty.setUserId(Long.parseLong(r.getData().toString()));
                comProperty.setCreateTime(DateUtil.date());
                this.comPropertyDao.insert(comProperty);
                return R.ok();
            }
        }
        return R.fail();
    }

    @Override
    public R update(ComPropertyVO comPropertyVO) {
        if(comPropertyVO!=null){
            ComProperty comProperty=new ComProperty();
            BeanUtils.copyProperties(comPropertyVO,comProperty);
            this.comPropertyDao.updateById(comProperty);
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R delete(Long id) {
        ComProperty comProperty=comPropertyDao.selectById(id);
        if(comProperty!=null){
            if(comProperty.getUserId()!=null){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comProperty.getUserId());
                administratorsUserVO.setCommunityId(comProperty.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comPropertyDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
            }
        }
        return R.fail("用户账号错误");
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml

New file
@@ -0,0 +1,42 @@
<?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_community.dao.ComActCommitteeDao">

    <resultMap type="com.panzhihua.service_community.entity.ComActCommittee" id="ComActCommitteeBaseResultMap">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="contactName" column="contact_name"/>
        <result property="phone" column="phone"/>
        <result property="areaId" column="area_id"/>
        <result property="userId" column="user_id"/>
        <result property="createTime" column="create_time"/>
        <result property="communityId" column="communityId"/>
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActCommiteeVO">
        select t.*,t1.account,t1.password,t2.area_name as areaName,t3.role_id as roleId from com_act_committee t
        left join sys_user t1 on t.user_id = t1.user_id
        left join com_mng_struct_area t2 on t.area_id = t2.id
        left join sys_user_role t3 on t.user_id = t3.user_id
        <where>
            1=1
            <if test="commonPage.areaId!=null and commonPage.areaId !=''">
                and t.area_id  =#{commonPage.areaId}
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and t.name like concat(#{commonPage.name},'%')
            </if>
            <if test="commonPage.phone!=null and commonPage.phone!=''">
                and t.phone like concat(#{commonPage.phone},'%')
            </if>
            <if test="commonPage.username!=null and commonPage.username!=''">
                and t.contact_name like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.paramId!=null">
                and t.community_id =#{commonPage.paramId}
            </if>
        </where>
        order by t.create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml

New file
@@ -0,0 +1,76 @@
<?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_community.dao.ComActSocialOrgDao">

    <resultMap type="com.panzhihua.service_community.entity.ComActSocialOrg" id="ComActSocialOrgBaseResultMap">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="businessNumber" column="business_number"/>
        <result property="buildDate" column="build_date"/>
        <result property="agencyCode" column="agency_code"/>
        <result property="weixinOfficialAccounts" column="weixin_official_accounts"/>
        <result property="companyType" column="company_type"/>
        <result property="registFee" column="regist_fee"/>
        <result property="assetsTotal" column="assets_total"/>
        <result property="assetsNet" column="assets_net"/>
        <result property="salesFee" column="sales_fee"/>
        <result property="taxesLastYear" column="taxes_last_year"/>
        <result property="staffCount" column="staff_count"/>
        <result property="maillingAddr" column="mailling_addr"/>
        <result property="postCode" column="post_code"/>
        <result property="officialUrl" column="official_url"/>
        <result property="corporationName" column="corporation_name"/>
        <result property="corporationGen" column="corporation_gen"/>
        <result property="corporationOfficePhone" column="corporation_office_phone"/>
        <result property="corporationPosition" column="corporation_position"/>
        <result property="corporationPhone" column="corporation_phone"/>
        <result property="corporationEmail" column="corporation_email"/>
        <result property="contactName" column="contact_name"/>
        <result property="contactGen" column="contact_gen"/>
        <result property="contactOfficePhone" column="contact_office_phone"/>
        <result property="contactPosition" column="contact_position"/>
        <result property="contactPhone" column="contact_phone"/>
        <result property="contactEmail" column="contact_email"/>
        <result property="businessScope" column="business_scope"/>
        <result property="businessImpact" column="business_impact"/>
        <result property="attachUrl" column="attach_url"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateAt" column="update_at"/>
        <result property="communityId" column="community_id"/>
        <result property="userId" column="user_id"/>
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        select t.*,t1.account,t1.password,t2.role_id as roleId from com_act_social_org t
        left join sys_user t1 on t.user_id = t1.user_id
        left join sys_user_role t2 on t.user_id = t2.user_id
        <where>
            1=1
            <if test="commonPage.type!=null">
                and t.company_type =#{commonPage.type}
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and t.name like concat(#{commonPage.name},'%')
            </if>
            <if test="commonPage.serialNo!=null and commonPage.serialNo!=''">
                and t.agencyCode like concat(#{commonPage.serialNo},'%')
            </if>
            <if test="commonPage.username!=null and commonPage.username!=''">
                and t.corporation_name like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.systemName!=null and commonPage.systemName!=''">
                and t.contact_name like concat(#{commonPage.systemName},'%')
            </if>
            <if test="commonPage.paramId!=null">
                and t.community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.phone!=null and commonPage.phone!=''">
                and t.contact_phone like concat(#{commonPage.phone},'%')
            </if>
        </where>
        order by t.create_at desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

New file
@@ -0,0 +1,38 @@
<?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_community.dao.ComPropertyDao">

    <resultMap type="com.panzhihua.service_community.entity.ComProperty" id="ComPropertyBaseResultMap">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="introduction" column="introduction"/>
        <result property="contactName" column="contact_name"/>
        <result property="phone" column="phone"/>
        <result property="address" column="address"/>
        <result property="userId" column="user_id"/>
        <result property="communityId" column="community_id"/>
        <result property="createTime" column="create_time"/>
        <result property="areaId" column="area_id"/>
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComPropertyVO">
        select t.*,t1.account,t1.password,t2.area_name as areaName,t3.role_id as roleId from com_property t
        left join sys_user t1 on t.user_id = t1.user_id
        left join com_mng_struct_area t2 on t.area_id = t2.id
        left join sys_user_role t3 on t.user_id = t3.user_id
        <where>
            1=1
            <if test="commonPage.name !=null and commonPage.name !=''">
                and t.name like concat(#{commonPage.name},'%')
            </if>
            <if test="commonPage.username !=null and commonPage.username !=''">
                and t.contact_name like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.phone !=null and commonPage.phone !=''">
                and t.phone like concat(#{commonPage.phone},'%')
            </if>
        </where>
        order by t.create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_property/pom.xml

@@ -28,6 +28,16 @@
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>cn.jpush.api</groupId>
            <artifactId>jpush-client</artifactId>
            <version>3.4.6</version>
        </dependency>
        <dependency>
            <groupId>cn.jpush.api</groupId>
            <artifactId>jiguang-common</artifactId>
            <version>1.1.8</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

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

@@ -64,7 +64,7 @@
        ComPropertyAlarm comPropertyAlarm=new ComPropertyAlarm();
        BeanUtils.copyProperties(comPropertyAlarmVO,comPropertyAlarm);
        comPropertyAlarm.setCreateTime(DateUtil.date());
        return R.ok(this.comPropertyAlarmService.save(comPropertyAlarm));
        return this.comPropertyAlarmService.insert(comPropertyAlarm);
    }

    /**

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

New file
@@ -0,0 +1,98 @@
package com.panzhihua.service_property.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.property.ComPropertyHelpVO;
import com.panzhihua.service_property.entity.ComPropertyHelp;
import com.panzhihua.service_property.service.ComPropertyHelpService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (ComPropertyHelp)表控制层
 *
 * @author makejava
 * @since 2021-09-18 16:43:12
 */
@RestController
@RequestMapping("comPropertyHelp")
public class ComPropertyHelpApi {
    /**
     * 服务对象
     */
    @Resource
    private ComPropertyHelpService comPropertyHelpService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comPropertyHelpService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.comPropertyHelpService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comPropertyHelp 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        if(comPropertyHelp!=null){
            ComPropertyHelp comPropertyHelp1=new ComPropertyHelp();
            BeanUtils.copyProperties(comPropertyHelp,comPropertyHelp1);
            return R.ok(this.comPropertyHelpService.save(comPropertyHelp1));
        }
        return R.fail();
    }

    /**
     * 修改数据
     *
     * @param comPropertyHelp 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComPropertyHelpVO comPropertyHelp) {
        if(comPropertyHelp!=null){
            ComPropertyHelp comPropertyHelp1=new ComPropertyHelp();
            BeanUtils.copyProperties(comPropertyHelp,comPropertyHelp1);
            return R.ok(this.comPropertyHelpService.updateById(comPropertyHelp1));
        }
        return R.fail();
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comPropertyHelpService.removeById(id));
    }
}

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

New file
@@ -0,0 +1,26 @@
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 org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_property.entity.ComPropertyHelp;
import org.apache.ibatis.annotations.Param;

/**
 * (ComPropertyHelp)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-18 16:43:11
 */
@Mapper
public interface ComPropertyHelpDao extends BaseMapper<ComPropertyHelp> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComPropertyHelp> pageList(Page page, @Param("commonPage")CommonPage commonPage);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java

@@ -84,4 +84,16 @@
     */
    @ApiModelProperty("设备类型 设备类型 1红外报警 2一键报警")
    private Integer type;

    /**
     * 手机号码
     */
    @ApiModelProperty("手机号")
    private String phone;

    /**
     * 街路巷id
     */
    @ApiModelProperty("街路巷id")
    private Long villageId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyHelp.java

New file
@@ -0,0 +1,73 @@
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;


/**
 * (ComPropertyHelp)表实体类
 *
 * @author makejava
 * @since 2021-09-18 16:43:11
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComPropertyHelp implements Serializable {

    private static final long serialVersionUID = 804376246485599231L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String imgUrl;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 状态 0 禁用 1启用
     */
    @ApiModelProperty(value = "状态 0 禁用 1启用")
    private Integer status;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

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

}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java

@@ -11,6 +11,9 @@

import javax.annotation.Resource;

/**
 * @author zzj
 */
@Component
@Slf4j
public class AlarmMessage {

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

@@ -23,4 +23,9 @@
     * 查询报警详情
     */
    R selectDetail(Integer id);

    /**
     * 新增报警记录
     */
    R insert(ComPropertyAlarm comPropertyAlarm);
}

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

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_property.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_property.entity.ComPropertyHelp;

/**
 * (ComPropertyHelp)表服务接口
 *
 * @author makejava
 * @since 2021-09-18 16:43:12
 */
public interface ComPropertyHelpService extends IService<ComPropertyHelp> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}

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

@@ -1,18 +1,26 @@
package com.panzhihua.service_property.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.ComPropertyAlarmVO;
import com.panzhihua.service_property.dao.ComPropertyEquipmentDao;
import com.panzhihua.service_property.entity.ComPropertyAlarm;
import com.panzhihua.service_property.dao.ComPropertyAlarmDao;
import com.panzhihua.service_property.entity.ComPropertyEquipment;
import com.panzhihua.service_property.service.ComPropertyAlarmService;
import com.panzhihua.service_property.util.JPushUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
 * (ComPropertyAlarm)表服务实现类
@@ -25,6 +33,8 @@
public class ComPropertyAlarmServiceImpl extends ServiceImpl<ComPropertyAlarmDao, ComPropertyAlarm> implements ComPropertyAlarmService {
    @Resource
    private ComPropertyAlarmDao comPropertyAlarmDao;
    @Resource
    private ComPropertyEquipmentDao comPropertyEquipmentDao;
    @Override
    public R pageList(CommonPage commonPage) {
        IPage<ComPropertyAlarmVO> page=comPropertyAlarmDao.selectList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage);
@@ -35,4 +45,47 @@
    public R selectDetail(Integer id) {
        return R.ok(comPropertyAlarmDao.selectById(id));
    }

    @Override
    public R insert(ComPropertyAlarm comPropertyAlarm) {
        if(comPropertyAlarm!=null){
            ComPropertyEquipment comPropertyEquipment=comPropertyEquipmentDao.selectOne(new QueryWrapper<ComPropertyEquipment>().lambda().eq(ComPropertyEquipment::getSerialNo,comPropertyAlarm.getSerialNo()));
            ComPropertyAlarmVO propertyAlarmVO=new ComPropertyAlarmVO();
            if(comPropertyEquipment!=null) {
                if (comPropertyAlarm.getType().equals(ComPropertyAlarm.type.one)) {
                    comPropertyAlarm.setStatus(ComPropertyAlarm.status.dcl);
                    comPropertyAlarm.setCommunityId(comPropertyEquipment.getCommunityId());
                    comPropertyAlarm.setPhone(comPropertyEquipment.getPhone());
                    comPropertyAlarm.setName(comPropertyEquipment.getUsername());
                    if (comPropertyAlarmDao.insert(comPropertyAlarm) > 0) {
                        BeanUtils.copyProperties(comPropertyAlarm,propertyAlarmVO);
                        propertyAlarmVO.setLatitude(comPropertyEquipment.getLatitude());
                        propertyAlarmVO.setLongitude(comPropertyEquipment.getLongitude());
                        Map<String, String> map = new HashMap<>();
                        map.put("title", "一键报警通知");
                        map.put("msg", comPropertyEquipment.getPosition() + "," + comPropertyEquipment.getUsername() + "发起报警");
                        map.put("communityId", comPropertyEquipment.getCommunityId().toString());
                        map.put("alarm",JSONObject.toJSONString(propertyAlarmVO));
                        JPushUtil.jpushAndroid(map);
                        return R.ok();
                    }

                } else {
                    if (comPropertyAlarmDao.insert(comPropertyAlarm) > 0) {
                        BeanUtils.copyProperties(comPropertyAlarm,propertyAlarmVO);
                        propertyAlarmVO.setLatitude(comPropertyEquipment.getLatitude());
                        propertyAlarmVO.setLongitude(comPropertyEquipment.getLongitude());
                        Map<String, String> map = new HashMap<>();
                        map.put("title", "长时间未移动报警通知");
                        map.put("msg", comPropertyEquipment.getPosition() + "," + comPropertyEquipment.getUsername() + "长时间未移动报警");
                        map.put("communityId", comPropertyEquipment.getCommunityId().toString());
                        map.put("alarm",JSONObject.toJSONString(propertyAlarmVO));
                        JPushUtil.jpushAndroid(map);
                        return R.ok();
                    }
                }
            }
        }
        return R.fail();
    }
}

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

New file
@@ -0,0 +1,30 @@
package com.panzhihua.service_property.service.impl;

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.service_property.entity.ComPropertyHelp;
import com.panzhihua.service_property.dao.ComPropertyHelpDao;
import com.panzhihua.service_property.service.ComPropertyHelpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * (ComPropertyHelp)表服务实现类
 *
 * @author makejava
 * @since 2021-09-18 16:43:12
 */
@Slf4j
@Service
public class ComPropertyHelpServiceImpl extends ServiceImpl<ComPropertyHelpDao, ComPropertyHelp> implements ComPropertyHelpService {
    @Resource
    private ComPropertyHelpDao comPropertyHelpDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comPropertyHelpDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java

New file
@@ -0,0 +1,158 @@
package com.panzhihua.service_property.util;

import cn.jiguang.common.resp.APIConnectionException;
import cn.jiguang.common.resp.APIRequestException;
import cn.jpush.api.JPushClient;
import cn.jpush.api.push.PushResult;
import cn.jpush.api.push.model.Message;
import cn.jpush.api.push.model.Options;
import cn.jpush.api.push.model.Platform;
import cn.jpush.api.push.model.PushPayload;
import cn.jpush.api.push.model.audience.Audience;
import cn.jpush.api.push.model.notification.AndroidNotification;
import cn.jpush.api.push.model.notification.IosNotification;
import cn.jpush.api.push.model.notification.Notification;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;

import java.util.Map;

/**
 * @ClassName JPushUtil
 * @Description:
 * @Author gzm
 * @Date 2020/6/12 10:14
 **/
@Slf4j
public class JPushUtil {

    /** 设置好账号的app_key和masterSecret是必须的
     用自己创建以用后的APP_KEY和MASTER_SECRET
     替换即可，后期可写到yml配置文件中*/
    @Value("{JPush.APP_KEY}")
    private static String APP_KEY = "6db03724d207e0debcca68af";
    private static String MASTER_SECRET = "8ba46c3e30e1fd2cea0b246e";

    // 极光推送>>Android
    //Map<String, String> parm是我自己传过来的参数,可以自定义参数

    public static void jpushAndroid(Map<String, String> parm) {

        // 创建JPushClient(极光推送的实例)
        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
        // 推送的关键,构造一个payload
        PushPayload payload = PushPayload.newBuilder()
                // 指定android平台的用户
                .setPlatform(Platform.android())
                // 同社区账号推送
                .setAudience(Audience.tag(parm.get("communityId")))

//                .setAudience(Audience.alias(parm.get("alias"))) // 设置别名发送,单发，点对点方式
                //.setAudience(Audience.tag("tag1")) // 设置按标签发送，相当于群发
//                .setAudience(Audience.registrationId(parm.get("id"))) // registrationId指定用户
                // 发送内容
                .setNotification(Notification.android(parm.get("msg"),
                        parm.get("title"), parm))
                // apnProduction指定开发环境 true为生产模式 false 为测试模式 (android不区分模式,ios区分模式) 不用设置也没关系
                // TimeToLive 两个小时的缓存时间
                .setOptions(Options.newBuilder().setApnsProduction(true).setTimeToLive(7200).build())
                // 自定义信息
                .setMessage(Message.content(parm.get("alarm")))
                .build();
        try {
            PushResult pu = jpushClient.sendPush(payload);

            System.out.println(pu.toString());

        } catch (APIConnectionException e) {
            e.printStackTrace();
        } catch (APIRequestException e) {
            e.printStackTrace();
        }
    }

    // 极光推送>>ios

    // Map<String, String> parm是我自己传过来的参数,可以自定义参数

    public static  void jpushIOS(Map<String, String> parm) {
        // 创建JPushClient
        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
        PushPayload payload = PushPayload.newBuilder()
                // ios平台的用户
                .setPlatform(Platform.ios())
                // 所有用户
                .setAudience(Audience.all())
                // registrationId指定用户
                //.setAudience(Audience.registrationId(parm.get("id")))
                .setNotification(Notification.newBuilder()
                        .addPlatformNotification(IosNotification.newBuilder()
                                .setAlert(parm.get("msg"))
                                .setBadge(+1)
                                // 这里是设置提示音
                                .setSound("happy")
                                .addExtras(parm)
                                .build())
                        .build())
                .setOptions(Options.newBuilder().setApnsProduction(false).build())
                // 自定义信息
                .setMessage(Message.newBuilder().setMsgContent(parm.get("msg")).addExtras(parm).build())
                .build();
        try {
            PushResult pu = jpushClient.sendPush(payload);
            log.info(String.valueOf(pu));
        } catch (APIConnectionException e) {
            e.printStackTrace();
        } catch (APIRequestException e) {
            e.printStackTrace();
        }
    }


    // 极光推送>>All所有平台

    public static void jpushAll(Map<String, String> param) {

        // 创建JPushClient
        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
        // 创建option
        PushPayload payload = PushPayload.newBuilder()
                // 所有平台的用户
                .setPlatform(Platform.all())
                // registrationId指定用户
                .setAudience(Audience.registrationId(param.get("id")))

                .setNotification(Notification.newBuilder()
                        // 发送ios
                        .addPlatformNotification(IosNotification.newBuilder()
                                // 消息体
                                .setAlert(param.get("msg"))
                                .setBadge(+1)
                                // ios提示音
                                .setSound("happy")
                                // 附加参数
                                .addExtras(param)
                                .build())
                        // 发送android
                        .addPlatformNotification(AndroidNotification.newBuilder()
                                // 附加参数
                                .addExtras(param)
                                // 消息体
                                .setAlert(param.get("msg"))
                                .build())
                        .build())
                // 指定开发环境 true为生产模式 false 为测试模式 (android不区分模式,ios区分模式)
                .setOptions(Options.newBuilder().setApnsProduction(true).build())
                // 自定义信息
                .setMessage(Message.newBuilder().setMsgContent(param.get("msg")).addExtras(param).build())
                .build();
        try {
            PushResult pu = jpushClient.sendPush(payload);
            log.info(String.valueOf(pu));
        } catch (APIConnectionException e) {
            e.printStackTrace();
        } catch (APIRequestException e) {
            e.printStackTrace();
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -18,7 +18,7 @@
    </resultMap>

    <select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.*,t1.position,t2.name as solveName from com_property_Alarm t
        select t.*,t1.position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
        left join com_property_equipment t1 on t.serial_no = t1.serial_no
        left join sys_user t2 on t.solve_id = user_id
        <where>
@@ -57,7 +57,7 @@

    <select id="selectById" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.*, t1.position, t2.name as solveName
        from com_property_Alarm t
        from com_property_alarm t
                 left join com_property_equipment t1 on t.serial_no = t1.serial_no
                 left join sys_user t2 on t.solve_id = user_id
        where t.id=#{id}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyHelpMapper.xml

New file
@@ -0,0 +1,30 @@
<?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.ComPropertyHelpDao">

    <resultMap type="com.panzhihua.service_property.entity.ComPropertyHelp" id="ComPropertyHelpBaseResultMap">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="imgUrl" column="img_url"/>
        <result property="phone" column="phone"/>
        <result property="status" column="status"/>
        <result property="createTime" column="create_time"/>
        <result property="communityId" column="community_id"/>
    </resultMap>


    <select id="pageList" resultMap="ComPropertyHelpBaseResultMap">
        select * from com_property_help
        <where>
            1=1
            <if test="commonPage.status !=null">
                and status =#{commonPage.status}
            </if>
            <if test="commonPage.paramId !=null">
                and community_id =#{commonPage.paramId}
            </if>
        </where>
        order by create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml

@@ -24,7 +24,7 @@
    </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
        select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id left join com_property t2 on t.property_id = t2.area_id
        <where>
            1=1
            <if test="commonPage.status !=null">
@@ -48,8 +48,11 @@
            <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 test="commonPage.paramId !=null and commonPage.paramId !=0">
                and t2.community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.areaId !=null and commonPage.areaId !=0">
                and t2.area_id =#{commonPage.areaId}
            </if>
            <if test="commonPage.userId !=null">
                and t.create_by =#{commonPage.userId}

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

@@ -125,6 +125,18 @@
    }

    /**
     * 重置密码
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPassword")
    public R resetPassword(@RequestParam("userId") Long userId) {
        return userService.resetPassword(userId);
    }

    /**
     * 某社区后台人员查询
     *
     * @param param
@@ -369,6 +381,19 @@
    }

    /**
     * 新增社区后台物业，社会组织，业主委员会账户
     *
     * @param administratorsUserVO
     *            账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstageproperty")
    public R adduserbackstageproperty(@RequestBody AdministratorsUserVO administratorsUserVO) {

        return userService.addUserBackstageProperty(administratorsUserVO);
    }

    /**
     * 删除后台用户
     *
     * @param administratorsUserVO

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

@@ -229,6 +229,15 @@
    R addUserBackstage(AdministratorsUserVO administratorsUserVO);

    /**
     * 新增社区后台物业，社会组织，业主委员会账户
     *
     * @param administratorsUserVO
     *            账户信息
     * @return 新增结果
     */
    R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营、社区后台账户
     * 
     * @param administratorsUserVO
@@ -685,4 +694,8 @@
     * @return
     */
    R checkCurrentUserIsTeam(String phone, Long communityId);
    /**
     * 重置密码
     */
    R resetPassword(Long userId);
}

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

@@ -195,6 +195,15 @@
                    sysMenuDOS1.forEach(sysMenuDO1 -> {
                        SysMenuVO sysMenuVO1 = new SysMenuVO();
                        BeanUtils.copyProperties(sysMenuDO1, sysMenuVO1);
                        List<SysMenuDO> sysMenuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda()
                                .eq(SysMenuDO::getParentId, sysMenuDO1.getMenuId()).orderByAsc(SysMenuDO::getOrderNum));
                        List<SysMenuVO> sysMenuVOList=new ArrayList<>();
                        sysMenuDOList.forEach(sysMenuDO2 -> {
                            SysMenuVO sysMenuVO2=new SysMenuVO();
                            BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
                            sysMenuVOList.add(sysMenuVO2);
                        });
                        sysMenuVO1.setSysMenuVOList(sysMenuVOList);
                        sysMenuVOS1.add(sysMenuVO1);
                    });
                    sysMenuVO.setSysMenuVOList(sysMenuVOS1);
@@ -263,26 +272,30 @@
        List<Long> collect =
            sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
        List<SysMenuDO> sysMenuDOS =
            sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect));
            sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect).eq(SysMenuDO::getParentId,0));
        List<SysMenuVO> sysMenuVOS = new ArrayList<>();
        sysMenuDOS.forEach(sysMenuDO -> {
            SysMenuVO sysMenuVO = new SysMenuVO();
            List<SysMenuVO> menuVOS=new ArrayList<>();
            BeanUtils.copyProperties(sysMenuDO, sysMenuVO);
            List<SysMenuDO> sysMenuDOList=sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId,sysMenuDO.getMenuId()).in(SysMenuDO::getMenuId, collect));
            sysMenuDOList.forEach(sysMenuDO1->{
                SysMenuVO sysMenuVO1 = new SysMenuVO();
                List<SysMenuVO> sysMenuVOList=new ArrayList<>();
                BeanUtils.copyProperties(sysMenuDO1, sysMenuVO1);
                List<SysMenuDO> sysMenuDOList1=sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId,sysMenuDO1.getMenuId()).in(SysMenuDO::getMenuId, collect));
                sysMenuDOList1.forEach(sysMenuDO2 -> {
                    SysMenuVO sysMenuVO2=new SysMenuVO();
                    BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
                    sysMenuVOList.add(sysMenuVO2);
                });
                sysMenuVO1.setSysMenuVOList(sysMenuVOList);
                menuVOS.add(sysMenuVO1);
            });
            sysMenuVO.setSysMenuVOList(menuVOS);
            sysMenuVOS.add(sysMenuVO);
        });
        List<SysMenuVO> collect1 =
            sysMenuVOS.stream().filter(sysMenuVO -> sysMenuVO.getParentId() == 0).collect(Collectors.toList());
        if (!ObjectUtils.isEmpty(collect1)) {
            collect1.forEach(sysMenuVO -> {
                Long menuId = sysMenuVO.getMenuId();
                List<SysMenuVO> sysMenuVOS1 =
                    sysMenuVOS.stream().filter(sysMenuVO1 -> sysMenuVO1.getParentId().intValue() == menuId.intValue())
                        .collect(Collectors.toList());
                sysMenuVO.setSysMenuVOList(sysMenuVOS1);
            });
        }

        return R.ok(collect1);
        return R.ok(sysMenuVOS);
    }

    /**
@@ -294,22 +307,13 @@
     */
    @Override
    public R listMenuBackstageByRole(Long roleId) {
        List<SysMenuVO> sysMenuVOS = new ArrayList<>();
        List<SysRoleMenuDO> sysRoleMenuDOS =
            sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
        if (!ObjectUtils.isEmpty(sysRoleMenuDOS)) {
            List<Long> longs =
                sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
            List<SysMenuDO> sysMenuDOS =
                sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, longs));
            if (!ObjectUtils.isEmpty(sysMenuDOS)) {
                sysMenuDOS.forEach(sysMenuDO -> {
                    SysMenuVO sysMenuVO1 = new SysMenuVO();
                    BeanUtils.copyProperties(sysMenuDO, sysMenuVO1);
                    sysMenuVOS.add(sysMenuVO1);
                });
            }
                return R.ok(longs);
        }
        return R.ok(sysMenuVOS);
        return R.fail();
    }
}

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

@@ -238,6 +238,9 @@
        loginUserInfoVO.setAccount(name);
        loginUserInfoVO.setType(sysUserDO.getType());
        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);// 暂时 身份证判断实名制
        if(sysUserDO.getCommunityId()!=null){
            loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
        }
        List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set = new HashSet<>();
        if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -1031,7 +1034,47 @@
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1 > 0) {
                return R.ok();
                return R.ok(userId);
            }
        }
        return R.fail();
    }

    @Override
    public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO = new SysUserDO();
        Long roleId = administratorsUserVO.getRoleId();
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");
        }
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("新增后台用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                throw new ServiceException("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
            }

        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao
                    .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType())
                            .eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
            Long userId = sysUserDO1.getUserId();
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setUserId(userId);
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1 > 0) {
                return R.ok(userId);
            }
        }
        return R.fail();
@@ -2437,4 +2480,17 @@
        }
        return R.ok(false);
    }

    @Override
    public R resetPassword(Long userId) {
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userId);
        String encode = new BCryptPasswordEncoder().encode("admin123456");
        sysUserDO.setPassword(encode);
        int update = userDao.updateById(sysUserDO);
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
    }
}