优化代码

java110

2021-12-02 d91329bda26053d9189f345f023da4bd200d3dae

 service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -2,12 +2,17 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
import com.java110.oa.bmo.oaWorkflow.IDeleteOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.ISaveOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.IUpdateOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflowData.IDeleteOaWorkflowDataBMO;
import com.java110.oa.bmo.oaWorkflowData.IGetOaWorkflowDataBMO;
import com.java110.oa.bmo.oaWorkflowData.ISaveOaWorkflowDataBMO;
import com.java110.oa.bmo.oaWorkflowData.IUpdateOaWorkflowDataBMO;
import com.java110.oa.bmo.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
@@ -17,6 +22,7 @@
import com.java110.oa.bmo.oaWorkflowXml.ISaveOaWorkflowXmlBMO;
import com.java110.oa.bmo.oaWorkflowXml.IUpdateOaWorkflowXmlBMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.utils.util.Assert;
@@ -63,6 +69,17 @@

    @Autowired
    private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;


    @Autowired
    private ISaveOaWorkflowDataBMO saveOaWorkflowDataBMOImpl;
    @Autowired
    private IUpdateOaWorkflowDataBMO updateOaWorkflowDataBMOImpl;
    @Autowired
    private IDeleteOaWorkflowDataBMO deleteOaWorkflowDataBMOImpl;

    @Autowired
    private IGetOaWorkflowDataBMO getOaWorkflowDataBMOImpl;

    /**
     * 微信保存消息模板
@@ -133,6 +150,7 @@
     */
    @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
    public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
                                                  @RequestHeader(value = "user-id") String userId,
                                                  @RequestParam(value = "flowId", required = false) String flowId,
                                                  @RequestParam(value = "state", required = false) String state,
                                                  @RequestParam(value = "page") int page,
@@ -143,6 +161,7 @@
        oaWorkflowDto.setStoreId(storeId);
        oaWorkflowDto.setFlowId(flowId);
        oaWorkflowDto.setState(state);
        oaWorkflowDto.setUserId(userId);
        return getOaWorkflowBMOImpl.get(oaWorkflowDto);
    }

@@ -362,6 +381,14 @@
            if ("flowId".equals(key)) {
                continue;
            }
            if("fileName".equals(key)){
                continue;
            }

            if("realFileName".equals(key)){
                continue;
            }

            columns.add(key);
            values.add(reqJson.getString(key));
        }
@@ -431,6 +458,31 @@
    }

    /**
     * 查询已办
     *
     * @param storeId 小区ID
     * @return
     * @serviceCode /oaWorkflow/queryOaWorkflowUser
     * @path /app/oaWorkflow/queryOaWorkflowUser
     */
    @RequestMapping(value = "/queryOaWorkflowUser", method = RequestMethod.GET)
    public ResponseEntity<String> queryOaWorkflowUser(@RequestHeader(value = "store-id") String storeId,
                                                                     @RequestHeader(value = "user-id") String userId,
                                                                     @RequestParam(value = "flowId", required = false) String flowId,
                                                                     @RequestParam(value = "id", required = false) String id,
                                                                     @RequestParam(value = "page") int page,
                                                                     @RequestParam(value = "row") int row) {
        JSONObject paramIn = new JSONObject();
        paramIn.put("page", page);
        paramIn.put("row", row);
        paramIn.put("flowId", flowId);
        paramIn.put("id", id);
        paramIn.put("storeId", storeId);
        paramIn.put("userId", userId);
        return getOaWorkflowFormBMOImpl.queryOaWorkflowUser(paramIn);
    }

    /**
     * 审核流程
     *
     * @param storeId 小区ID
@@ -440,6 +492,7 @@
     */
    @RequestMapping(value = "/auditOaWorkflow", method = RequestMethod.POST)
    public ResponseEntity<String> auditOaWorkflow(@RequestHeader(value = "store-id") String storeId,
                                                  @RequestHeader(value = "user-id") String userId,
                                                  @RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "flowId", "flowId不能为空");
        Assert.hasKeyAndValue(reqJson, "id", "id不能为空");
@@ -447,6 +500,110 @@
        Assert.hasKeyAndValue(reqJson, "auditMessage", "审核意见不能为空");
        Assert.hasKeyAndValue(reqJson, "auditCode", "审核状态不能为空");
        reqJson.put("storeId", storeId);
        reqJson.put("curUserId", userId);
        return getOaWorkflowFormBMOImpl.auditOaWorkflow(reqJson);
    }

    /**
     * 审核流程
     *
     * @param storeId 小区ID
     * @return
     * @serviceCode /oaWorkflow/getNextTask
     * @path /app/oaWorkflow/getNextTask
     */
    @RequestMapping(value = "/getNextTask", method = RequestMethod.GET)
    public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
                                              @RequestHeader(value = "user-id") String userId,
                                              @RequestParam(value = "flowId") String flowId,
                                              @RequestParam(value = "id") String id,
                                              @RequestParam(value = "taskId") String taskId) {
        JSONObject reqJson = new JSONObject();
        reqJson.put("storeId", storeId);
        reqJson.put("taskId", taskId);
        reqJson.put("userId", userId);
        reqJson.put("flowId", flowId);
        reqJson.put("id", id);
        return getOaWorkflowFormBMOImpl.getNextTask(reqJson);
    }


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

        Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");


        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
        return saveOaWorkflowDataBMOImpl.save(oaWorkflowDataPo);
    }

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

        Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");
        Assert.hasKeyAndValue(reqJson, "dataId", "dataId不能为空");


        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
        return updateOaWorkflowDataBMOImpl.update(oaWorkflowDataPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /oaWorkflow/deleteOaWorkflowData
     * @path /app/oaWorkflow/deleteOaWorkflowData
     */
    @RequestMapping(value = "/deleteOaWorkflowData", method = RequestMethod.POST)
    public ResponseEntity<String> deleteOaWorkflowData(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

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


        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
        return deleteOaWorkflowDataBMOImpl.delete(oaWorkflowDataPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param storeId 小区ID
     * @return
     * @serviceCode /oaWorkflow/queryOaWorkflowData
     * @path /app/oaWorkflow/queryOaWorkflowData
     */
    @RequestMapping(value = "/queryOaWorkflowData", method = RequestMethod.GET)
    public ResponseEntity<String> queryOaWorkflowData(@RequestHeader(value = "store-id") String storeId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "businessKey") String businessKey,
                                                      @RequestParam(value = "row") int row) {
        OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
        oaWorkflowDataDto.setPage(page);
        oaWorkflowDataDto.setRow(row);
        oaWorkflowDataDto.setStoreId(storeId);
        oaWorkflowDataDto.setBusinessKey(businessKey);
        return getOaWorkflowDataBMOImpl.get(oaWorkflowDataDto);
    }
}