模型开发

service-web/src/main/java/com/zzsn/clb/member/controller/MemSubjectController.java

@@ -70,7 +70,7 @@ public class MemSubjectController extends JeecgController<MemSubject, IMemSubjec
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaQueryWrapper<MemSubject> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MemSubject::getUserId, user.getId());
-        queryWrapper.select(MemSubject::getSubjectId);
+        queryWrapper.select(MemSubject::getLabelId);
         return Result.OK(memSubjectService.list(queryWrapper).stream().map(m -> m.getLabelId()).collect(Collectors.toList()));
     }
 
@@ -94,9 +94,11 @@ public class MemSubjectController extends JeecgController<MemSubject, IMemSubjec
         memSubjectService.remove(queryWrapper);
         List<MemSubject> list = new ArrayList<>();
         jsonArray.forEach(x -> {
+            Map<String,String> jo =(Map<String,String>)x;
             MemSubject memSubject = new MemSubject();
             memSubject.setUserId(user.getId());
-            memSubject.setSubjectId(x.toString());
+            memSubject.setSubjectId(jo.get("subjectId"));
+            memSubject.setLabelId(jo.get("labelId"));
             list.add(memSubject);
         });
         //添加新数据

service-web/src/main/java/com/zzsn/clb/member/mapper/xml/SubjectMapper.xml

@@ -2,20 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zzsn.clb.member.mapper.SubjectMapper">
     <select id="getSubjectList" resultType="java.util.Map">
-        SELECT    s.id subjectId,
-                  s.subject_name subjectName,
-                  lb.label_mark as labelMark,
-                  le.id labelId,
-                  le.`name` labelName
+        SELECT s.id             subjectId,
+               s.subject_name   subjectName,
+               lb.label_name    labelTypeName,
+               lb.label_mark as labelMark,
+               le.id            labelId,
+               le.`name`        labelName
         FROM `subject` s
                  INNER JOIN subject_type_map stm ON s.id = stm.subject_id
                  INNER JOIN subject_model_map smm ON s.id = smm.subject_id
                  INNER JOIN python_model pm ON smm.model_id = pm.id
-                 INNER JOIN sys_base_label_type lb ON lb.id = pm.label_id
+                 INNER JOIN sys_base_label_type lb ON lb.top_id = pm.label_id
                  INNER JOIN sys_base_label_type_map lm ON lb.id = lm.label_id
                  INNER JOIN label_entity le ON le.id = lm.relation_id
-        WHERE stm.type_id = '1627954091596574722'
-          AND le.`status` = 1
+        WHERE le.`status` = 1
+          and pm.type = 3
         ORDER BY s.id,
                  le.sort ASC
     </select>

service-web/src/main/java/com/zzsn/clb/test/ImportExcelData.java

@@ -43,9 +43,9 @@ public class ImportExcelData {
     SubjectMapper subjectMapper;
 
     public void importData() {
-        String path = "C:\\Users\\EDY\\Documents\\WeChat Files\\wxid_7d7tl0zyfdxb21\\FileStorage\\File\\2023-02\\克虏宝汇总审核后数据2次修改.xlsx";
+        String path = "C:\\Users\\EDY\\Documents\\WeChat Files\\wxid_7d7tl0zyfdxb21\\FileStorage\\File\\2023-02\\管理动态-下属机构工作.xlsx";
         try {
-            impData(401, 10, path, 410);
+            impData(1, 10, path, 6);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -202,7 +202,7 @@ public class ImportExcelData {
             subjectData.setFlag("1");
             log.info(JSON.toJSONString(subjectData));
 
-           IndexRequest request = new IndexRequest("subjectdatabase1")
+           IndexRequest request = new IndexRequest("subjectdatabase")
                     .id(id)
                     .source(JSON.toJSONString(subjectData), XContentType.JSON);
             IndexResponse indexResponse = client.index(request, RequestOptions.DEFAULT);

service-web/src/main/java/com/zzsn/common/Constants.java

@@ -2,5 +2,7 @@ package com.zzsn.common;
 
 public class Constants {
     //处理后的专题资讯信息存储索引
-    public final static String ES_DATA_FOR_SUBJECT = "subjectdatabase";
+    public final static String ES_DATA_FOR_SUBJECT = "tmp_subjectdatabase";
+    //新采集库（22.04.23）
+    public final static String ES_BASE_DATA = "basedata";
 }

service-web/src/main/java/com/zzsn/utils/MapToBeanUtil.java

+package com.zzsn.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanMap;
+import org.apache.commons.beanutils.BeanUtils;
+
+import java.util.Map;
+
+/**
+ * @author 闫鑫
+ * @date 2022/8/26 12:51
+ */
+@Slf4j
+public class MapToBeanUtil {
+    /**
+     * 把map转为Bean对象
+     *
+     * @param map 待转换的map
+     * @param beanClass class类型
+     * @param <T> 返回值类型
+     * @return 返回值
+     */
+    public static <T> T mapToObject(Map<String, Object> map, Class<T> beanClass) {
+        try {
+            if (map == null || map.size() == 0) {
+                return null;
+            }
+            T obj = beanClass.newInstance();
+            BeanUtils.populate(obj, map);
+            return obj;
+        } catch (Exception e) {
+            log.error("map->Bean转换失败，map:{},e:{}", map, e);
+        }
+        return null;
+    }
+
+    /**
+     * 对象转map
+     * @param obj
+     * @return
+     */
+    public static Map<?, ?> objectToMap(Object obj) {
+        if (obj == null) {
+            return null;
+        }
+        return new BeanMap(obj);
+    }
+}