Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw

2369059705@qq.com

2023-07-17 87e8b958288e719fd15ad4295b50a475a2fbec3f

 product-server-project-base/src/main/java/com/product/base/controller/BaseItemizeController.java

ÎļþÃû´Ó product-server-project-base/src/main/java/com/product/base/controller/ProjectItemController.java ÐÞ¸Ä
@@ -10,18 +10,18 @@

import com.product.base.config.BaseErrorCode;
import com.product.base.config.CmnConst;
import com.product.base.service.ProjectItemService;
import com.product.base.service.BaseItemizeService;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
import com.product.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;

@RequestMapping("/api/project")
@RequestMapping("/api/base-itemize")
@RestController
public class ProjectItemController extends AbstractBaseController{
public class BaseItemizeController extends AbstractBaseController{

   @Autowired
   ProjectItemService projectItemService;
   BaseItemizeService baseItemizeService;
   
   /**
    *    èŽ·å–所有项目分类
@@ -40,7 +40,7 @@
            if (BaseUtil.strIsNull(fse.getString(CmnConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CmnConst.PAGESIZE))) {
            return error(BaseErrorCode.SYSTEM_CPAGES_NOT_NULL.getValue(), BaseErrorCode.SYSTEM_CPAGES_NOT_NULL.getText());
         }
            return OK_List(projectItemService.listProjectType(fse));
            return OK_List(baseItemizeService.listProjectType(fse));
      } catch (Exception e) {
         return this.error(BaseErrorCode.PROJECT_TYPE_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_TYPE_OPERATE_FAIL.getText()+e.getMessage());
      }
@@ -63,7 +63,7 @@
            if (BaseUtil.strIsNull(fse.getUUID())) {
            return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getText());
         }
            return OK_List(projectItemService.getProjectType(fse.getUUID()));
            return OK_List(baseItemizeService.getProjectType(fse.getUUID()));
      } catch (Exception e) {
         return this.error(BaseErrorCode.PROJECT_TYPE_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_TYPE_OPERATE_FAIL.getText()+e.getMessage());
      }
@@ -83,7 +83,7 @@
            FieldSetEntity fse=BaseUtil.getFieldSetEntity(request);
            
            //保存
            boolean succ = projectItemService.saveProjectType(fse);
            boolean succ = baseItemizeService.saveProjectType(fse);
            if (succ) {
            return OK();
         }
@@ -99,7 +99,7 @@
    * @param response
    * @return
    */
   @RequestMapping(value="/project-item/tree/{version}", method = RequestMethod.POST)
   @RequestMapping(value="/itemize/tree/{version}", method = RequestMethod.POST)
   @ApiVersion(1)
   public String listProjectItemTree(HttpServletRequest request, HttpServletResponse response) {
      try {
@@ -110,7 +110,7 @@
            if (BaseUtil.strIsNull(fse.getUUID())) {
            return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getText());
         }
            return BaseUtil.success(projectItemService.listProjectItemTree(fse.getUUID()));
            return BaseUtil.success(baseItemizeService.listProjectItemTree(fse.getUUID()));
      } catch (Exception e) {
         return this.error(BaseErrorCode.PROJECT_ITEM_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_ITEM_OPERATE_FAIL.getText()+e.getMessage());
      }
@@ -122,14 +122,14 @@
    * @param response
    * @return
    */
   @RequestMapping(value="/project-item/save/{version}", method = RequestMethod.POST)
   @RequestMapping(value="/itemize/save/{version}", method = RequestMethod.POST)
   @ApiVersion(1)
   public String saveProjectItem(HttpServletRequest request, HttpServletResponse response) {
      try {
         //获取参数
            FieldSetEntity fse=BaseUtil.getFieldSetEntity(request);
            //保存
            return BaseUtil.success(projectItemService.saveProjectItem(fse));
            return BaseUtil.success(baseItemizeService.saveProjectItem(fse));
      } catch (Exception e) {
         return this.error(BaseErrorCode.PROJECT_ITEM_SAVE_FAIL.getValue(), BaseErrorCode.PROJECT_ITEM_SAVE_FAIL.getText()+e.getMessage());
      }
@@ -141,7 +141,7 @@
    * @param response
    * @return
    */
   @RequestMapping(value="/project-item/delete/{version}", method = RequestMethod.POST)
   @RequestMapping(value="/itemize/delete/{version}", method = RequestMethod.POST)
   @ApiVersion(1)
   public String deleteProjectItem(HttpServletRequest request, HttpServletResponse response) {
      try {
@@ -152,7 +152,7 @@
            return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getText());
         }
            //删除验证
            return BaseUtil.success(projectItemService.deleteProjectItem(fse.getUUID()));
            return BaseUtil.success(baseItemizeService.deleteProjectItem(fse.getUUID()));
      } catch (Exception e) {
         return this.error(BaseErrorCode.PROJECT_ITEM_SAVE_FAIL.getValue(), BaseErrorCode.PROJECT_ITEM_SAVE_FAIL.getText()+e.getMessage());
      }