Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java

@@ -1,23 +1,25 @@
package com.vci.ubcs.code.controller;


import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.ubcs.code.dto.CodeClassifyValueDTO;
import com.vci.ubcs.code.service.ICodeClassifyValueService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;

import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;


/**
 * 分类码段的码值控制器
@@ -32,7 +34,7 @@
    * 分类码段的码值 服务
    */
    @Autowired
    private CodeClassifyValueServiceI codeClassifyValueService;
    private ICodeClassifyValueService codeClassifyValueService;

    /**
     * 分类码段的码值树
@@ -50,9 +52,8 @@
     * @return 执行结果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    @PostMapping( "/addSave")
    public BaseResult<CodeClassifyValueVO> addSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
         CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.addSave(codeClassifyValueDTO);
         return BaseResult.success(codeClassifyValueVO);
    public R<CodeClassifyValueVO> addSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
      return R.status(codeClassifyValueService.addSave(codeClassifyValueDTO));
    }

    /**
@@ -61,9 +62,8 @@
     * @return 执行结果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    @PutMapping("/editSave")
    public BaseResult<CodeClassifyValueVO> editSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
        CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.editSave(codeClassifyValueDTO);
        return BaseResult.success(codeClassifyValueVO);
    public R<CodeClassifyValueVO> editSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
        return R.status(codeClassifyValueService.editSave(codeClassifyValueDTO));
    }

    /**
@@ -72,7 +72,7 @@
    * @return 执行结果 success为true为可以删除，false表示有数据引用，obj为true表示有下级
    */
    @PostMapping( "/checkIsCanDelete")
    public BaseResult checkIsCanDelete( CodeClassifyValueDTO codeClassifyValueDTO)  {
    public R checkIsCanDelete(CodeClassifyValueDTO codeClassifyValueDTO)  {
        return codeClassifyValueService.checkIsCanDelete(codeClassifyValueDTO);
    }

@@ -82,7 +82,7 @@
     * @return 删除结果反馈：：success：成功，fail：失败
     */
    @DeleteMapping( "/deleteData")
    public BaseResult delCodeClassifyValue( CodeClassifyValueDTO codeClassifyValueDTO) {
    public R delCodeClassifyValue(@Valid @RequestBody CodeClassifyValueDTO codeClassifyValueDTO) {
        return codeClassifyValueService.deleteCodeClassifyValue(codeClassifyValueDTO);
    }

@@ -92,9 +92,9 @@
    * @return 分类码段的码值显示对象
    */
    @GetMapping("/getObjectByOid")
    public BaseResult<CodeClassifyValueVO> getObjectByOid(String oid){
    public R<CodeClassifyValueVO> getObjectByOid(String oid){
        CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.getObjectByOid(oid);
        return BaseResult.success(codeClassifyValueVO);
        return R.data(codeClassifyValueVO);
    }

    /**
@@ -103,14 +103,10 @@
     * @return 分类码段的码值显示对象
     */
    @GetMapping("/listDataByOids")
    public BaseResult<CodeClassifyValueVO> listCodeClassifyValueByOids(String oids){
    public R<Collection<CodeClassifyValueVO>> listCodeClassifyValueByOids(String oids){
        Collection<CodeClassifyValueVO> voCollection =  codeClassifyValueService.listCodeClassifyValueByOids(VciBaseUtil.str2List(oids));
        BaseResult baseResult = BaseResult.success();
        baseResult.setData(voCollection);
        return  baseResult;
        return R.data(voCollection);
    }



    /**
    * 参照树 分类码段的码值
@@ -128,19 +124,19 @@
     * @return 执行结果
     */
    @PostMapping("/saveOrder")
    public BaseResult saveOrder(@RequestBody Map<String,Object> param){
    public R saveOrder(@RequestBody Map<String,Object> param){
        JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
        List<CodeClassifyValueDTO> dtoList = new ArrayList<>();
        for (int i = 0; i < json.size(); i++) {
            CodeClassifyValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeClassifyValueDTO.class);
            dtoList.add(codeFixedValueDTO);
        }
        String codeclassifysecoid = (String) param.get("codeclassifysecoid");
        String codeClassifySecOid = (String) param.get("codeClassifySecOid");
        VciBaseUtil.alertNotNull(dtoList,"码值集合");
        if (CollectionUtils.isEmpty(dtoList)){
            return BaseResult.success();
            return R.success("");
        }
        return codeClassifyValueService.batchSave4Order(dtoList,codeclassifysecoid);
        return codeClassifyValueService.batchSave4Order(dtoList,codeClassifySecOid);
    }

}