添加机构信息管理功能

src/main/java/com/jsh/erp/controller/MaterialCategoryController.java

@@ -137,8 +137,8 @@ public class MaterialCategoryController {
         MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class);
         int i= materialCategoryService.editMaterialCategory(mc);
         if(i<1){
-            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE,
-                    ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG);
+            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_EDIT_FAILED_CODE,
+                    ExceptionConstants.MATERIAL_CATEGORY_EDIT_FAILED_MSG);
         }
         return result;
     }

src/main/java/com/jsh/erp/controller/OrganizationController.java

@@ -0,0 +1,159 @@
+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.datasource.entities.MaterialCategory;
+import com.jsh.erp.datasource.entities.Organization;
+import com.jsh.erp.datasource.vo.TreeNode;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.materialCategory.MaterialCategoryService;
+import com.jsh.erp.service.organization.OrganizationService;
+import com.jsh.erp.utils.BaseResponseInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * create by: cjl
+ * description:
+ *
+ * create time: 2019/3/6 10:54
+ */
+@RestController
+@RequestMapping(value = "/organization")
+public class OrganizationController {
+    private Logger logger = LoggerFactory.getLogger(OrganizationController.class);
+
+    @Resource
+    private OrganizationService organizationService;
+    /**
+     * 根据id来查询机构信息
+     * @param id
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/findById")
+    public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) throws Exception {
+        BaseResponseInfo res = new BaseResponseInfo();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            List<Organization> dataList = organizationService.findById(id);
+            JSONObject outer = new JSONObject();
+            if (null != dataList) {
+                for (Organization org : dataList) {
+                    outer.put("id", org.getId());
+                    outer.put("orgFullName", org.getOrgFullName());
+                    outer.put("orgAbr", org.getOrgAbr());
+                    outer.put("orgParentNo", org.getOrgParentNo());
+                    List<Organization> dataParentList = organizationService.findByOrgNo(org.getOrgNo());
+                    if(dataParentList!=null&&dataParentList.size()>0){
+                        //父级机构名称显示简称
+                        outer.put("orgParentName", dataParentList.get(0).getOrgAbr());
+                    }
+                    outer.put("orgTpcd", org.getOrgTpcd());
+                    outer.put("orgStcd", org.getOrgStcd());
+                    outer.put("orgNo", org.getOrgNo());
+                    outer.put("sort", org.getSort());
+                    outer.put("orgCreateTime", sdf.format(org.getOrgCreateTime()));
+                    outer.put("orgStopTime", sdf.format(org.getOrgStopTime()));
+                    outer.put("remark", org.getRemark());
+                }
+            }
+            res.code = 200;
+            res.data = outer;
+        } catch(Exception e){
+            e.printStackTrace();
+            res.code = 500;
+            res.data = "获取数据失败";
+        }
+        return res;
+    }
+
+    /**
+     * create by: cjl
+     * description:
+     * 获取机构树数据
+     * create time: 2019/2/19 11:49
+     * @Param:
+     * @return com.alibaba.fastjson.JSONArray
+     */
+    @RequestMapping(value = "/getOrganizationTree")
+    public JSONArray getOrganizationTree() throws Exception{
+       JSONArray arr=new JSONArray();
+       List<TreeNode> organizationTree= organizationService.getOrganizationTree();
+       if(organizationTree!=null&&organizationTree.size()>0){
+           for(TreeNode node:organizationTree){
+               String str=JSON.toJSONString(node);
+               JSONObject obj=JSON.parseObject(str);
+               arr.add(obj) ;
+           }
+       }
+        return arr;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  新增机构信息
+     * create time: 2019/2/19 17:17
+     * @Param: beanJson
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/addOrganization")
+    public Object addOrganization(@RequestParam("info") String beanJson) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        Organization org= JSON.parseObject(beanJson, Organization.class);
+        int i= organizationService.addOrganization(org);
+        if(i<1){
+            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ADD_FAILED_CODE,
+                    ExceptionConstants.ORGANIZATION_ADD_FAILED_MSG);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  修改机构信息
+     * create time: 2019/2/20 9:30
+     * @Param: beanJson
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/editOrganization")
+    public Object editOrganization(@RequestParam("info") String beanJson) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        Organization org= JSON.parseObject(beanJson, Organization.class);
+        int i= organizationService.editOrganization(org);
+        if(i<1){
+            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_EDIT_FAILED_CODE,
+                    ExceptionConstants.ORGANIZATION_EDIT_FAILED_MSG);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  批量删除机构信息
+     * create time: 2019/2/19 17:26
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/batchDeleteOrganization")
+    public Object batchDeleteOrganization(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= organizationService.batchDeleteOrganizationByIds(ids);
+        if(i<1){
+            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_DELETE_FAILED_CODE,
+                    ExceptionConstants.ORGANIZATION_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+}