优化代码

Your Name

2023-02-16 7e280211528ef1287f79207c7f4835855e245e16

 service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java

old mode 100644
new mode 100755
@@ -31,8 +31,10 @@

    @Autowired
    private ISaveActivitiesRuleBMO saveActivitiesRuleBMOImpl;

    @Autowired
    private IUpdateActivitiesRuleBMO updateActivitiesRuleBMOImpl;

    @Autowired
    private IDeleteActivitiesRuleBMO deleteActivitiesRuleBMOImpl;

@@ -41,8 +43,10 @@

    @Autowired
    private ISaveActivitiesBeautifulStaffBMO saveActivitiesBeautifulStaffBMOImpl;

    @Autowired
    private IUpdateActivitiesBeautifulStaffBMO updateActivitiesBeautifulStaffBMOImpl;

    @Autowired
    private IDeleteActivitiesBeautifulStaffBMO deleteActivitiesBeautifulStaffBMOImpl;

@@ -62,17 +66,13 @@
    public ResponseEntity<String> saveActivitiesRule(
            @RequestHeader(value = "store-id", required = false) String storeId,
            @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "ruleName", "请求报文中未包含ruleName");
        Assert.hasKeyAndValue(reqJson, "ruleType", "请求报文中未包含ruleType");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
        Assert.hasKeyAndValue(reqJson, "activitiesObj", "请求报文中未包含activitiesObj");
        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");

        String activitiesObj = reqJson.getString("activitiesObj");


        ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
        if ("4444".equals(activitiesObj)) {
            activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
@@ -95,7 +95,6 @@
     */
    @RequestMapping(value = "/updateActivitiesRule", method = RequestMethod.POST)
    public ResponseEntity<String> updateActivitiesRule(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "ruleName", "请求报文中未包含ruleName");
        Assert.hasKeyAndValue(reqJson, "ruleType", "请求报文中未包含ruleType");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
@@ -103,8 +102,6 @@
        Assert.hasKeyAndValue(reqJson, "activitiesObj", "请求报文中未包含activitiesObj");
        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
        Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId不能为空");


        ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
        return updateActivitiesRuleBMOImpl.update(activitiesRulePo);
    }
@@ -120,10 +117,7 @@
    @RequestMapping(value = "/deleteActivitiesRule", method = RequestMethod.POST)
    public ResponseEntity<String> deleteActivitiesRule(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId不能为空");


        ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
        return deleteActivitiesRuleBMOImpl.delete(activitiesRulePo);
    }
@@ -137,12 +131,17 @@
     * @path /app/activitiesRule/queryActivitiesRule
     */
    @RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
    public ResponseEntity<String> queryActivitiesRule(
            @RequestHeader(value = "store-id", required = false) String storeId,
            @RequestParam(value = "communityId") String communityId,
            @RequestParam(value = "page") int page,
            @RequestParam(value = "row") int row) {
    public ResponseEntity<String> queryActivitiesRule(@RequestHeader(value = "store-id", required = false) String storeId,
                                                      @RequestParam(value = "ruleType", required = false) String ruleType,
                                                      @RequestParam(value = "ruleName", required = false) String ruleName,
                                                      @RequestParam(value = "activitiesObj", required = false) String activitiesObj,
                                                      @RequestParam(value = "communityId") String communityId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
        activitiesRuleDto.setRuleType(ruleType);
        activitiesRuleDto.setRuleName(ruleName);
        activitiesRuleDto.setActivitiesObj(activitiesObj);
        activitiesRuleDto.setPage(page);
        activitiesRuleDto.setRow(row);
        activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
@@ -162,13 +161,10 @@
    public ResponseEntity<String> saveActivitiesBeautifulStaff(
            @RequestHeader(value = "store-id") String storeId,
            @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");


        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
        activitiesBeautifulStaffPo.setStoreId(storeId);
        return saveActivitiesBeautifulStaffBMOImpl.save(activitiesBeautifulStaffPo);
@@ -184,14 +180,11 @@
     */
    @RequestMapping(value = "/updateActivitiesBeautifulStaff", method = RequestMethod.POST)
    public ResponseEntity<String> updateActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");


        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
        return updateActivitiesBeautifulStaffBMOImpl.update(activitiesBeautifulStaffPo);
    }
@@ -207,10 +200,7 @@
    @RequestMapping(value = "/deleteActivitiesBeautifulStaff", method = RequestMethod.POST)
    public ResponseEntity<String> deleteActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");


        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
        return deleteActivitiesBeautifulStaffBMOImpl.delete(activitiesBeautifulStaffPo);
    }
@@ -225,9 +215,15 @@
     */
    @RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
    public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
                                                                @RequestParam(value = "ruleId", required = false) String ruleId,
                                                                @RequestParam(value = "activitiesNum", required = false) String activitiesNum,
                                                                @RequestParam(value = "staffName", required = false) String staffName,
                                                                @RequestParam(value = "page") int page,
                                                                @RequestParam(value = "row") int row) {
        ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
        activitiesBeautifulStaffDto.setStaffName(staffName);
        activitiesBeautifulStaffDto.setRuleId(ruleId);
        activitiesBeautifulStaffDto.setActivitiesNum(activitiesNum);
        activitiesBeautifulStaffDto.setPage(page);
        activitiesBeautifulStaffDto.setRow(row);
        activitiesBeautifulStaffDto.setStoreId(storeId);