feat: update something

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/util/Ip2Region.java

@@ -1,13 +1,10 @@
 package com.qunzhixinxi.hnqz.common.core.util;
 
-import org.apache.commons.io.FileUtils;
 import org.lionsoul.ip2region.xdb.Searcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
 /**

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysImplementPlanDTO.java

@@ -115,6 +115,8 @@ public final class SysImplementPlanDTO {
         @Min(value = 10, message = "分页数量最小为{value}")
         @Max(value = 100, message = "分页数量最大为{value}")
         private Integer size;
+
+        private Integer planId;
     }
 
     @Data

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysImplementPlanController.java

@@ -1,10 +1,11 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDetailsDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysImplementPlan;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysImplementPlanVO;
 import com.qunzhixinxi.hnqz.admin.manager.SysImplementPlanManager;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -19,8 +20,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 执行计划前端控制器
@@ -44,6 +47,11 @@ public class SysImplementPlanController {
 
     }
 
+    @GetMapping(value = "/plan/info/{plan_id}")
+    public R<SysImplementPlanVO.ToList> getPlanById(@PathVariable(value = "plan_id") Long planId) {
+        return R.ok(implementPlanManager.findById(planId));
+    }
+
 
     @GetMapping(value = "/plan/page")
     public R<Page<?>> pagePlans(@Validated SysImplementPlanDTO.OnPage query) {
@@ -51,6 +59,32 @@ public class SysImplementPlanController {
         return R.ok(implementPlanManager.pagePlans(query, SecurityUtils.getUser()));
     }
 
+    @SuppressWarnings("unchecked")
+    @GetMapping(value = "/plan/children/list")
+    public R<List<Tree<Integer>>> listPlanChildren(@Validated SysImplementPlanDTO.OnPage query) {
+
+        Page<?> page = implementPlanManager.pagePlans(query, SecurityUtils.getUser());
+
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return R.ok(Collections.emptyList());
+        }
+
+        List<Tree<Integer>> records = (List<Tree<Integer>>) page.getRecords();
+
+        for (Tree<Integer> record : records) {
+            Integer id = record.getId();
+            if (!Objects.equals(id, query.getPlanId())) {
+                continue;
+            }
+
+            List<Tree<Integer>> children = record.getChildren();
+            return R.ok(children);
+
+        }
+
+        return R.ok(Collections.emptyList());
+    }
+
     @GetMapping(value = "/plan/list")
     public R<List<SysImplementPlanVO.ToList>> listPlans(@RequestParam(value = "planState", required = false, defaultValue = "PASSED") UpmsState.ImplementPlanState planState) {
         return R.ok(implementPlanManager.listPlans(planState, SecurityUtils.getUser()));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -41,6 +41,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -468,4 +469,31 @@ public class SysImplementPlanManager {
         }).collect(Collectors.toList());
 
     }
+
+    public SysImplementPlanVO.ToList findById(Long plainId) {
+        SysImplementPlan p = implementPlanService.getById(plainId);
+        SysImplementPlanVO.ToList copied = BeanUtil.copyProperties(p, SysImplementPlanVO.ToList.class);
+
+        // 设置承接人信息
+        // 获取承接人
+
+        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(new HashSet<>(Collections.singletonList(p.getConsigneeId())));
+        Map<String, Object> consigneeInfo = new HashMap<>(2);
+        consigneeInfo.put("consigneeId", p.getConsigneeId());
+        SysDept sysDept = consigneeMap.get(p.getConsigneeId());
+        consigneeInfo.put("consigneeName", sysDept == null ? "" : sysDept.getName());
+        copied.setConsigneeInfo(consigneeInfo);
+
+        // 产品信息
+        List<Map<String, String>> skuList = drugEntDrugtableService.listDrugs(Collections.singletonList(p.getSkuId()));
+        Map<Integer, Map<String, String>> skuMap = skuList.stream().collect(Collectors.toMap(sku -> Integer.valueOf(sku.get("drug_id")), Function.identity()));
+        Map<String, String> sku = skuMap.get(p.getSkuId());
+        Map<String, Object> skuInfo = new HashMap<>(3);
+        skuInfo.put("skuId", p.getSkuId());
+        skuInfo.put("skuName", MapUtil.isEmpty(sku) ? "" : sku.get("drug_name"));
+        skuInfo.put("manufacturer", MapUtil.isEmpty(sku) ? "" : sku.get("ent_name"));
+        copied.setSkuInfo(skuInfo);
+
+        return copied;
+    }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/util/GetOpenIDUtil.java

@@ -18,12 +18,12 @@ import java.util.Map;
 public class GetOpenIDUtil {
 
 	// cos pro 环境
-	public static final String CSO_PRO_APPID = "wxd03398e1bff2b241";
-	public static final String CSO_PRO_APPSECRET = "f745fa594d51534845e8412433951a20";
+	public static final String CSO_PRO_APPID = "wx1c531f81360684cd";
+	public static final String CSO_PRO_APPSECRET = "3dbba237f44fe3660b0b46cc861960ff";
 
 	// cos demo 环境
-	public static final String CSO_DEMO_APPID = "wx956bb32e73073426";
-	public static final String CSO_DEMO_APPSECRET = "cb722986c23cc352b7f87ff2dae4cc11";
+	public static final String CSO_DEMO_APPID = "wx1c531f81360684cd";
+	public static final String CSO_DEMO_APPSECRET = "3dbba237f44fe3660b0b46cc861960ff";
 
 	public static Map<String, Object> oauth2GetOpenid(String code, String env) {
 		String appid;