init: init project step4: biz code support

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

@@ -275,78 +275,78 @@ public class ApiController {
         log.info("get_task_content_config_by_task_type_id:{}", taskTypeId);
         //switch (taskTypeId) {
         //    case "14":
-            //case "31":
-            //case "37":
-                // 常规调查
-                //configMap.put("14", getTaskContentConfigByTaskTypeId("14"));
-                //// 首次调查
-                //configMap.put("31", getTaskContentConfigByTaskTypeId("31"));
-                //// 库存盘点-中药颗粒剂
-                //configMap.put("37", getTaskContentConfigByTaskTypeId("37"));
-                //break;
-            //case "39":
-            //case "40":
-            //case "41":
-            //    // 应收账款回款-A类、应收账款回款-B类、应收账款回款-C类 都取39
-            //    configMap = getTaskContentConfigByTaskTypeId("39");
-            //    break;
-            //case "42":
-            //case "43":
-            //case "44":
-            //    // 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
-            //    configMap = getTaskContentConfigByTaskTypeId("42");
-            //    break;
-            //case "47":
-            //case "48":
-            //case "49":
-            //case "50":
-            //    // 库存调研、竞品调研、培训、使用情况调查 都取47
-            //    configMap = getTaskContentConfigByTaskTypeId("47");
-            //    break;
-            //case "51":
-            //case "52":
-            //case "53":
-            //    // 信用管理A/B/C 都取51
-            //    configMap = getTaskContentConfigByTaskTypeId("51");
-            //    break;
-            //case "56":
-            //case "57":
-            //    // 56首营管理-诊所
-            //    configMap.put("56", getTaskContentConfigByTaskTypeId("56"));
-            //    // 57首营管理-药店
-            //    configMap.put("57", getTaskContentConfigByTaskTypeId("57"));
-            //    break;
-            //case "1":
-            //case "2":
-            //case "3":
-            //case "4":
-            //case "64":
-            //    // 1,医院科室推广会 2,区域学术沙龙 3,城市卫星会 4,省级学科年会 64,线上科室会
-            //    configMap.put("1", getTaskContentConfigByTaskTypeId("1"));
-            //    configMap.put("2", getTaskContentConfigByTaskTypeId("2"));
-            //    configMap.put("3", getTaskContentConfigByTaskTypeId("3"));
-            //    configMap.put("4", getTaskContentConfigByTaskTypeId("4"));
-            //    configMap.put("64", getTaskContentConfigByTaskTypeId("64"));
-            //    break;
-            //case "801":
-            //    configMap.put("801", getTaskContentConfigByTaskTypeId("801"));
-            //
-            //    HnqzUser user = SecurityUtils.getUser();
-            //
-            //
-            //    String yycUsername = user != null ? user.getUsername() : "";
-            //
-            //    List<Map<String, String>> urls = Stream.of(RANDOM_QUIZ_URL).map(url -> {
-            //        String[] split = url.split("\\|");
-            //        Map<String, String> quizInfoMap = new HashMap<>(2);
-            //        quizInfoMap.put("label", split[0]);
-            //        quizInfoMap.put("url", split[1] + "?yycUsername=" + yycUsername + "&yycPkgId=");
-            //        return quizInfoMap;
-            //    }).collect(Collectors.toList());
-            //
-            //
-            //    configMap.put("urls", urls);
-            //    break;
+        //case "31":
+        //case "37":
+        // 常规调查
+        //configMap.put("14", getTaskContentConfigByTaskTypeId("14"));
+        //// 首次调查
+        //configMap.put("31", getTaskContentConfigByTaskTypeId("31"));
+        //// 库存盘点-中药颗粒剂
+        //configMap.put("37", getTaskContentConfigByTaskTypeId("37"));
+        //break;
+        //case "39":
+        //case "40":
+        //case "41":
+        //    // 应收账款回款-A类、应收账款回款-B类、应收账款回款-C类 都取39
+        //    configMap = getTaskContentConfigByTaskTypeId("39");
+        //    break;
+        //case "42":
+        //case "43":
+        //case "44":
+        //    // 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
+        //    configMap = getTaskContentConfigByTaskTypeId("42");
+        //    break;
+        //case "47":
+        //case "48":
+        //case "49":
+        //case "50":
+        //    // 库存调研、竞品调研、培训、使用情况调查 都取47
+        //    configMap = getTaskContentConfigByTaskTypeId("47");
+        //    break;
+        //case "51":
+        //case "52":
+        //case "53":
+        //    // 信用管理A/B/C 都取51
+        //    configMap = getTaskContentConfigByTaskTypeId("51");
+        //    break;
+        //case "56":
+        //case "57":
+        //    // 56首营管理-诊所
+        //    configMap.put("56", getTaskContentConfigByTaskTypeId("56"));
+        //    // 57首营管理-药店
+        //    configMap.put("57", getTaskContentConfigByTaskTypeId("57"));
+        //    break;
+        //case "1":
+        //case "2":
+        //case "3":
+        //case "4":
+        //case "64":
+        //    // 1,医院科室推广会 2,区域学术沙龙 3,城市卫星会 4,省级学科年会 64,线上科室会
+        //    configMap.put("1", getTaskContentConfigByTaskTypeId("1"));
+        //    configMap.put("2", getTaskContentConfigByTaskTypeId("2"));
+        //    configMap.put("3", getTaskContentConfigByTaskTypeId("3"));
+        //    configMap.put("4", getTaskContentConfigByTaskTypeId("4"));
+        //    configMap.put("64", getTaskContentConfigByTaskTypeId("64"));
+        //    break;
+        //case "801":
+        //    configMap.put("801", getTaskContentConfigByTaskTypeId("801"));
+        //
+        //    HnqzUser user = SecurityUtils.getUser();
+        //
+        //
+        //    String yycUsername = user != null ? user.getUsername() : "";
+        //
+        //    List<Map<String, String>> urls = Stream.of(RANDOM_QUIZ_URL).map(url -> {
+        //        String[] split = url.split("\\|");
+        //        Map<String, String> quizInfoMap = new HashMap<>(2);
+        //        quizInfoMap.put("label", split[0]);
+        //        quizInfoMap.put("url", split[1] + "?yycUsername=" + yycUsername + "&yycPkgId=");
+        //        return quizInfoMap;
+        //    }).collect(Collectors.toList());
+        //
+        //
+        //    configMap.put("urls", urls);
+        //    break;
         //    default:
         //        configMap = getTaskContentConfigByTaskTypeId(taskTypeId);
         //        break;
@@ -1458,8 +1458,13 @@ public class ApiController {
 
         String ipAddr = HttpUtils.getIpAddr(request);
         log.info("提交任务远端IP: [{}]", ipAddr);
-        //String region = ip2Region.toRegion(ipAddr);
-        String region = "xxx-yyy";
+        String region = "未知-未知";
+        try {
+            region = ip2Region.toRegion(ipAddr);
+        } catch (Exception e) {
+            log.info("ip2Region error", e);
+        }
+        ;
         log.info("提交任务远端地址: [{}]", region);
         log.info("saveTaskContent入参：{}", wmTaskContent);
         Set<String> errorHash = new HashSet<>();
@@ -1509,11 +1514,12 @@ public class ApiController {
         String locationId = null;
         try {
             String temp32 = wmTaskContent.getTemp32();
-            if (JSONUtil.isJsonArray(temp32)){
+            if (JSONUtil.isJsonArray(temp32)) {
                 locationId = wmTaskContent.getTemp24();
                 JSONArray array = JSONUtil.parseArray(temp32);
 
                 AtomicInteger score = new AtomicInteger();
+                String finalRegion = region;
                 array.forEach(item -> {
 
                     cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(item);
@@ -1523,17 +1529,17 @@ public class ApiController {
                     String drugIds = jsonObject.getStr("drugIds");
                     wmTaskContent.setTemp17(drugIds);
 
-                    R<?> r1 = wmTaskContentService.saveTaskContent(wmTaskContent, ipAddr, region);
+                    R<?> r1 = wmTaskContentService.saveTaskContent(wmTaskContent, ipAddr, finalRegion);
                     Map<String, String> data = (Map<String, String>) r1.getData();
                     String s = data.get("score");
-                    if (StrUtil.isNotBlank(s)){
-                     score.addAndGet(Integer.parseInt(s));
+                    if (StrUtil.isNotBlank(s)) {
+                        score.addAndGet(Integer.parseInt(s));
                     }
 
                 });
                 Map<String, String> res = new HashMap<>(1);
                 res.put("score", String.valueOf(score.get()));
-                r  = R.ok(res);
+                r = R.ok(res);
 
             } else {
                 r = wmTaskContentService.saveTaskContent(wmTaskContent, ipAddr, region);
@@ -1560,7 +1566,7 @@ public class ApiController {
             }
 
             // 获取签到key
-            if (StrUtil.isNotBlank(locationId)){
+            if (StrUtil.isNotBlank(locationId)) {
                 String cacheKey = String.format("user:sign:temp:%s:%s", id, locationId);
                 redisTemplate.delete(cacheKey);
             }