Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-07-11 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22

 service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java

@@ -1,8 +1,8 @@
package com.java110.report.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.reportInfoSetting.ReportInfoSettingDto;
import com.java110.po.reportInfoSetting.ReportInfoSettingPo;
import com.java110.dto.reportInfo.ReportInfoSettingDto;
import com.java110.po.reportInfo.ReportInfoSettingPo;
import com.java110.report.bmo.reportInfoSetting.IDeleteReportInfoSettingBMO;
import com.java110.report.bmo.reportInfoSetting.IGetReportInfoSettingBMO;
import com.java110.report.bmo.reportInfoSetting.ISaveReportInfoSettingBMO;
@@ -29,10 +29,11 @@

    /**
     * 微信保存消息模板
     * @serviceCode /reportInfoSetting/saveReportInfoSetting
     * @path /app/reportInfoSetting/saveReportInfoSetting
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSetting/saveReportInfoSetting
     * @path /app/reportInfoSetting/saveReportInfoSetting
     */
    @RequestMapping(value = "/saveReportInfoSetting", method = RequestMethod.POST)
    public ResponseEntity<String> saveReportInfoSetting(@RequestBody JSONObject reqJson) {
@@ -50,10 +51,11 @@

    /**
     * 微信修改消息模板
     * @serviceCode /reportInfoSetting/updateReportInfoSetting
     * @path /app/reportInfoSetting/updateReportInfoSetting
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSetting/updateReportInfoSetting
     * @path /app/reportInfoSetting/updateReportInfoSetting
     */
    @RequestMapping(value = "/updateReportInfoSetting", method = RequestMethod.POST)
    public ResponseEntity<String> updateReportInfoSetting(@RequestBody JSONObject reqJson) {
@@ -64,7 +66,7 @@
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
//        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
        Assert.hasKeyAndValue(reqJson, "settingId", "settingId不能为空");


@@ -74,10 +76,11 @@

    /**
     * 微信删除消息模板
     * @serviceCode /reportInfoSetting/deleteReportInfoSetting
     * @path /app/reportInfoSetting/deleteReportInfoSetting
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSetting/deleteReportInfoSetting
     * @path /app/reportInfoSetting/deleteReportInfoSetting
     */
    @RequestMapping(value = "/deleteReportInfoSetting", method = RequestMethod.POST)
    public ResponseEntity<String> deleteReportInfoSetting(@RequestBody JSONObject reqJson) {
@@ -92,23 +95,26 @@

    /**
     * 微信删除消息模板
     * @serviceCode /reportInfoSetting/queryReportInfoSetting
     * @path /app/reportInfoSetting/queryReportInfoSetting
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportInfoSetting/queryReportInfoSetting
     * @path /app/reportInfoSetting/queryReportInfoSetting
     */
    @RequestMapping(value = "/queryReportInfoSetting", method = RequestMethod.GET)
    public ResponseEntity<String> queryReportInfoSetting(@RequestParam(value = "communityId") String communityId,
                                                         @RequestParam(value = "name",required = false) String name,
                                                         @RequestParam(value = "settingId",required = false) String settingId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
                                                         @RequestParam(value = "name", required = false) String name,
                                                         @RequestParam(value = "settingId", required = false) String settingId,
                                                         @RequestParam(value = "reportType", required = false) String reportType,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
        ReportInfoSettingDto reportInfoSettingDto = new ReportInfoSettingDto();
        reportInfoSettingDto.setPage(page);
        reportInfoSettingDto.setRow(row);
        reportInfoSettingDto.setCommunityId(communityId);
        reportInfoSettingDto.setNameLike(name);
        reportInfoSettingDto.setSettingId(settingId);
        reportInfoSettingDto.setReportType(reportType);
        return getReportInfoSettingBMOImpl.get(reportInfoSettingDto);
    }
}