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

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 service-community/src/main/java/com/java110/community/api/RepairApi.java

old mode 100644
new mode 100755
@@ -8,6 +8,8 @@
import com.java110.community.bmo.repairReturnVisit.IUpdateRepairReturnVisitBMO;
import com.java110.dto.appraise.AppraiseDto;
import com.java110.dto.repairReturnVisit.RepairReturnVisitDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.repairReturnVisit.RepairReturnVisitPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -15,24 +17,32 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 报修 控制类
 */
@RestController
@RequestMapping("/repair")
public class RepairApi {

    @Autowired
    private IAppraiseRepairBMO appraiseRepairBMOImpl;

    @Autowired
    private ISaveRepairReturnVisitBMO saveRepairReturnVisitBMOImpl;

    @Autowired
    private IUpdateRepairReturnVisitBMO updateRepairReturnVisitBMOImpl;

    @Autowired
    private IDeleteRepairReturnVisitBMO deleteRepairReturnVisitBMOImpl;

    @Autowired
    private IGetRepairReturnVisitBMO getRepairReturnVisitBMOImpl;

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;


    /**
@@ -57,15 +67,27 @@
     * @path /app/repair/saveRepairReturnVisit
     */
    @RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
    public ResponseEntity<String> saveRepairReturnVisit(@RequestBody JSONObject reqJson) {
    public ResponseEntity<String> saveRepairReturnVisit(@RequestHeader(value = "user-id") String userId,

                                                        @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "repairId", "请求报文中未包含repairId");
        Assert.hasKeyAndValue(reqJson, "visitPersonId", "请求报文中未包含visitPersonId");
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
        Assert.hasKeyAndValue(reqJson, "visitType", "请求报文中未包含满意度");
        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");

        UserDto userDto = new UserDto();
        userDto.setUserId(userId);
        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);

        Assert.listOnlyOne(userDtos,"未包含用户");


        String userName  = userDtos.get(0).getName();

        RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
        repairReturnVisitPo.setVisitPersonId(userId);
        repairReturnVisitPo.setVisitPersonName(userName);
        return saveRepairReturnVisitBMOImpl.save(repairReturnVisitPo);
    }

@@ -120,8 +142,10 @@
     */
    @RequestMapping(value = "/queryRepairReturnVisit", method = RequestMethod.GET)
    public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
                                                         @RequestParam(value = "repairId") String repairId,
                                                         @RequestParam(value = "repairName") String repairName,
                                                         @RequestParam(value = "repairId", required = false) String repairId,
                                                         @RequestParam(value = "repairName", required = false) String repairName,
                                                         @RequestParam(value = "tel", required = false) String tel,
                                                         @RequestParam(value = "repairType", required = false) String repairType,
                                                         @RequestParam(value = "state") String state,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
@@ -130,6 +154,9 @@
        repairReturnVisitDto.setRow(row);
        repairReturnVisitDto.setCommunityId(communityId);
        repairReturnVisitDto.setRepairId(repairId);
        repairReturnVisitDto.setRepairName(repairName);
        repairReturnVisitDto.setTel(tel);
        repairReturnVisitDto.setRepairType(repairType);
        repairReturnVisitDto.setState(state);

        return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);