杰生重构

hx-service/storage-restructure/src/main/java/com/fjhx/controller/common/CommonController.java

@@ -0,0 +1,46 @@
+package com.fjhx.controller.common;
+
+import cn.hutool.core.convert.Convert;
+import com.fjhx.utils.Assert;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.ISysClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/common")
+public class CommonController {
+
+    @Resource
+    private ISysClient sysClient;
+
+    @PostMapping("/getInfo")
+    public R getInfo() {
+        BladeUser user = AuthUtil.getUser();
+        if (user == null) {
+            return R.fail("未获取登录用户");
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        Long userId = user.getUserId();
+        String account = user.getAccount();
+        String userName = user.getNickName();
+        String deptId = user.getDeptId().split(",")[0];
+        R<String> r = sysClient.getDeptName(Convert.toLong(deptId));
+        String deptName = Assert.result(r);
+
+        map.put("userId", userId);
+        map.put("account", account);
+        map.put("userName", userName);
+        map.put("deptId", deptId);
+        map.put("deptName", deptName);
+
+        return R.success(map);
+    }
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/controller/common/CommonFileController.java

@@ -1,20 +1,13 @@
 package com.fjhx.controller.common;
 
-import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.entity.common.CommonFile;
-import com.fjhx.entity.example.ExampleInfo;
-import com.fjhx.params.ExampleResult;
 import com.fjhx.service.common.CommonFileService;
-import com.fjhx.utils.ExampleAbstract;
-import com.fjhx.utils.FlowConstructor;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DigestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,66 +32,11 @@ public class CommonFileController {
         return R.success(result);
     }
 
-    @PostMapping("list")
+    @PostMapping("/list")
     public R list(@RequestBody CommonFile commonFile) {
-        List<CommonFile> list = commonFileService.list(Wrappers.<CommonFile>lambdaQuery()
-                .eq(CommonFile::getBusinessId, commonFile.getBusinessId()));
+        List<CommonFile> list = commonFileService.list(Wrappers.<CommonFile>lambdaQuery().eq(CommonFile::getBusinessId, commonFile.getBusinessId()));
         return R.success(list);
     }
 
-
-    private FlowConstructor flowConstructor() {
-        return FlowConstructor.init(
-                new ExampleAbstract() {
-                    @Override
-                    public String getCode() {
-                        return "test";
-                    }
-
-                    @Override
-                    public void end() {
-                        ExampleInfo cacheData = getCacheData(ExampleInfo.class);
-                        System.err.println("缓存     " + cacheData);
-                        System.err.println("流程结束了");
-                    }
-
-                    @Override
-                    public void reject() {
-                        System.err.println("审批驳回方法(直接结束流程)");
-                    }
-
-                    @Override
-                    public String circulation() {
-                        return super.circulation();
-                    }
-
-                    @Override
-                    public void fail() {
-                        System.err.println("审批不通过方法(返回上一节点)");
-                    }
-                }
-        );
-    }
-
-    @GetMapping("create")
-    public R test() {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("processInfoId", "1111111111111111111111");
-        map.put("processTenantId", "222222222222222222222");
-        ExampleResult result = flowConstructor().create(123456L, "测试流程", "测试开始流程", map);
-        return R.success(result);
-    }
-
-    @GetMapping("jump")
-    public R jump(@RequestParam("buttonId") Long buttonId) {
-        flowConstructor().jump(123456L, buttonId, "测试流程运行");
-        return R.success();
-    }
-
-    @GetMapping("/getPassword")
-    public String getPassword(@RequestParam("password") String password) {
-        return DigestUtil.hex(MD5.create().digestHex(password));
-    }
-
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/material/impl/MaterialClassifyServiceImpl.java

@@ -2,7 +2,9 @@ package com.fjhx.service.material.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.StorageBaseEntity;
 import com.fjhx.entity.material.MaterialClassify;
 import com.fjhx.mapper.material.MaterialClassifyMapper;
 import com.fjhx.params.material.MaterialClassifyVo;
@@ -26,7 +28,13 @@ public class MaterialClassifyServiceImpl extends ServiceImpl<MaterialClassifyMap
 
     @Override
     public List<JSONObject> tree() {
-        return TreeUtil.buildTreeObj(list());
+        return TreeUtil.buildTreeObj(
+                list(Wrappers.<MaterialClassify>lambdaQuery()
+                        .select(StorageBaseEntity::getId,
+                                MaterialClassify::getName,
+                                MaterialClassify::getParentId,
+                                MaterialClassify::getCode)
+                ));
     }
 
     @Override