optmize

java110

2023-05-29 bd72b193becb5770c2ba7dd0580d46428def7a03

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

@@ -2,8 +2,7 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.questionAnswerTitle.QuestionAnswerTitleDto;
import com.java110.dto.reportInfoSettingTitle.ReportInfoSettingTitleDto;
import com.java110.dto.reportInfoSetting.ReportInfoSettingTitleDto;
import com.java110.po.reportInfoSettingTitle.ReportInfoSettingTitlePo;
import com.java110.report.bmo.reportInfoSettingTitle.IDeleteReportInfoSettingTitleBMO;
import com.java110.report.bmo.reportInfoSettingTitle.IGetReportInfoSettingTitleBMO;
@@ -11,6 +10,7 @@
import com.java110.report.bmo.reportInfoSettingTitle.IUpdateReportInfoSettingTitleBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -31,15 +31,15 @@

    /**
     * 微信保存消息模板
     * @serviceCode /reportInfoSettingTitle/saveReportInfoSettingTitle
     * @path /app/reportInfoSettingTitle/saveReportInfoSettingTitle
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSettingTitle/saveReportInfoSettingTitle
     * @path /app/reportInfoSettingTitle/saveReportInfoSettingTitle
     */
    @RequestMapping(value = "/saveReportInfoSettingTitle", method = RequestMethod.POST)
    public ResponseEntity<String> saveReportInfoSettingTitle(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "titleId", "请求报文中未包含titleId");
        Assert.hasKeyAndValue(reqJson, "settingId", "请求报文中未包含settingId");
        Assert.hasKeyAndValue(reqJson, "title", "请求报文中未包含title");
        Assert.hasKeyAndValue(reqJson, "titleType", "请求报文中未包含titleType");
@@ -48,26 +48,31 @@
        JSONArray titleValues = null;
        if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
            titleValues = reqJson.getJSONArray("titleValues");

            if (titleValues.size() < 1) {
                throw new IllegalArgumentException("未包含选项");
            }
            for (int index = 0; index < titleValues.size(); index++) {
                JSONObject param = titleValues.getJSONObject(index);
                if (StringUtil.isEmpty(param.getString("qaValue"))) {
                    throw new IllegalArgumentException("题目选项不能为空");
                }
            }
        }

        ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
        return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
        return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo, titleValues);
    }

    /**
     * 微信修改消息模板
     * @serviceCode /reportInfoSettingTitle/updateSettingTitle
     * @path /app/reportInfoSettingTitle/updateReportInfoSettingTitle
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSettingTitle/updateSettingTitle
     * @path /app/reportInfoSettingTitle/updateSettingTitle
     */
    @RequestMapping(value = "/updateSettingTitle", method = RequestMethod.POST)
    public ResponseEntity<String> updateReportInfoSettingTitle(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "titleId", "请求报文中未包含titleId");
        Assert.hasKeyAndValue(reqJson, "settingId", "请求报文中未包含settingId");
        Assert.hasKeyAndValue(reqJson, "title", "请求报文中未包含title");
@@ -77,24 +82,30 @@
        JSONArray titleValues = null;
        if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
            titleValues = reqJson.getJSONArray("titleValues");

            if (titleValues.size() < 1) {
                throw new IllegalArgumentException("未包含选项");
            }
            for (int index = 0; index < titleValues.size(); index++) {
                JSONObject param = titleValues.getJSONObject(index);
                if (StringUtil.isEmpty(param.getString("qaValue"))) {
                    throw new IllegalArgumentException("题目选项不能为空");
                }
            }
        }

        ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
        deleteReportInfoSettingTitleBMOImpl.delete(reportInfoSettingTitlePo);

        return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
        return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo, titleValues);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /reportInfoSettingTitle/deleteSettingTitle
     * @path /app/reportInfoSettingTitle/deleteReportInfoSettingTitle
     *
     * @param reqJson
     * @return
     * @serviceCode /reportInfoSettingTitle/deleteSettingTitle
     * @path /app/reportInfoSettingTitle/deleteReportInfoSettingTitle
     */
    @RequestMapping(value = "/deleteSettingTitle", method = RequestMethod.POST)
    public ResponseEntity<String> deleteReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
@@ -109,26 +120,27 @@

    /**
     * 微信删除消息模板
     * @serviceCode /reportInfoSettingTitle/querySettingTitle
     * @path /app/reportInfoSettingTitle/queryReportInfoSettingTitle
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportInfoSettingTitle/querySettingTitle
     * @path /app/reportInfoSettingTitle/queryReportInfoSettingTitle
     */
    @RequestMapping(value = "/querySettingTitle", method = RequestMethod.GET)
    public ResponseEntity<String> queryReportInfoSettingTitle(@RequestParam(value = "communityId") String communityId,
                                                              @RequestParam(value = "titleType",required = false) String titleType,
                                                              @RequestParam(value = "title",required = false) String title,
                                                              @RequestParam(value = "titleId",required = false) String titleId,
                                                              @RequestParam(value = "settingid",required = false) String settingid,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
                                                              @RequestParam(value = "titleType", required = false) String titleType,
                                                              @RequestParam(value = "title", required = false) String title,
                                                              @RequestParam(value = "titleId", required = false) String titleId,
                                                              @RequestParam(value = "settingId", required = false) String settingId,
                                                              @RequestParam(value = "page") int page,
                                                              @RequestParam(value = "row") int row) {
        ReportInfoSettingTitleDto reportInfoSettingTitleDto = new ReportInfoSettingTitleDto();
        reportInfoSettingTitleDto.setPage(page);
        reportInfoSettingTitleDto.setRow(row);
        reportInfoSettingTitleDto.setTitleType(titleType);
        reportInfoSettingTitleDto.setTitleLike(title);
        reportInfoSettingTitleDto.setTitleId(titleId);
        reportInfoSettingTitleDto.setSettingId(settingid);
        reportInfoSettingTitleDto.setSettingId(settingId);
        reportInfoSettingTitleDto.setCommunityId(communityId);
        return getReportInfoSettingTitleBMOImpl.get(reportInfoSettingTitleDto);
    }