数据标准

server/src/main/java/edp/davinci/controller/DataSubjectController.java

@@ -72,6 +72,7 @@ public class DataSubjectController extends BaseController
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
+
         dataSubject = dataSubjectService.createDataSubject(dataSubject);
 
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(dataSubject));

server/src/main/java/edp/davinci/controller/DictController.java

@@ -222,4 +222,20 @@ public class DictController extends BaseController
         dictService.deleteDictData(id);
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request));
     }
+
+    /**
+     * 根据字典类型获取字典数据
+     *
+     * @param dictType
+     * @param user
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "get getDictDataList")
+    @GetMapping("/getDictDataList/{dictType}")
+    public ResponseEntity getDictDataList(@PathVariable String dictType,
+                                            HttpServletRequest request) {
+        List<DictData> dictDataList = dictService.getDictData(dictType);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(dictDataList));
+    }
 }

server/src/main/java/edp/davinci/dao/DataSubjectMapper.java

@@ -1,8 +1,6 @@
 package edp.davinci.dao;
 
-import edp.davinci.model.Catalogue;
 import edp.davinci.model.DataSubject;
-import edp.davinci.model.DictType;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -19,20 +17,10 @@ public interface DataSubjectMapper
     @Delete({"delete from `data_subject` where id = #{id}"})
     int deleteById(@Param("id") Long id);
 
-    @Update({
-            "update `dict_type`",
-            "set `dict_name` = #{dictName,jdbcType=VARCHAR},",
-            "`dict_type` = #{dictType,jdbcType=VARCHAR},",
-            "`status` = #{status,jdbcType=BIGINT},",
-            "`remark` = #{remark,jdbcType=VARCHAR},",
-            "`update_by` = #{updateBy,jdbcType=BIGINT},",
-            "`update_time` = #{updateTime,jdbcType=TIMESTAMP}",
-            "where dict_id = #{dictId,jdbcType=BIGINT}"
-    })
     int update(DataSubject dataSubject);
 
 
-    @Select({"select * from `data_subject`"})
+    @Select({"SELECT ds.*,dd.dict_label as  standard_theme FROM data_subject ds LEFT JOIN dict_data dd ON ds.p_id = dd.dict_code"})
     List<DataSubject> getDataSubjectList();
 
     @Select({"select * from `data_subject` where id = #{id}"})

server/src/main/java/edp/davinci/service/DataSubjectService.java

@@ -1,5 +1,6 @@
 package edp.davinci.service;
 
+import edp.core.exception.ServerException;
 import edp.davinci.model.Catalogue;
 import edp.davinci.model.DataSubject;
 import edp.davinci.model.User;
@@ -8,7 +9,7 @@ import java.util.List;
 
 public interface DataSubjectService
 {
-    DataSubject  createDataSubject(DataSubject dataSubject);
+    DataSubject  createDataSubject(DataSubject dataSubject) throws ServerException;
 
     void updateDataSubject(DataSubject dataSubject);
 

server/src/main/java/edp/davinci/service/impl/DataSubjectServiceImpl.java

@@ -1,5 +1,6 @@
 package edp.davinci.service.impl;
 
+import edp.core.exception.ServerException;
 import edp.davinci.dao.DataSubjectMapper;
 import edp.davinci.model.DataSubject;
 import edp.davinci.service.DataSubjectService;
@@ -18,8 +19,19 @@ public class DataSubjectServiceImpl implements DataSubjectService
     private DataSubjectMapper dataSubjectMapper;
 
     @Override
-    public DataSubject createDataSubject(DataSubject dataSubject)
+    public DataSubject createDataSubject(DataSubject dataSubject) throws ServerException
     {
+        if (null == dataSubject)
+        {
+
+            throw new ServerException("dataSubject is null ");
+
+        }
+
+        if (null == dataSubject.getId())
+        {
+            throw new ServerException("标准分类 pid is null ");
+        }
         dataSubjectMapper.insert(dataSubject);
         return dataSubject;
     }

server/src/main/resources/mybatis/mapper/DataSubjectMapper.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="edp.davinci.dao.DataSubjectMapper">
+
+    <insert id="insert" parameterType="edp.davinci.model.DataSubject">
+        insert into `data_subject`
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="standardCode != null">
+                standard_code,
+            </if>
+            <if test="standardName != null">
+                standard_name,
+            </if>
+            <if test="standardAlias != null">
+                standard_alias,
+            </if>
+            <if test="englishName != null">
+                english_name,
+            </if>
+            <if test="deptName != null">
+                `dept_name`,
+            </if>
+            <if test="management != null">
+                `management`,
+            </if>
+            <if test="pId != null">
+                `p_id`,
+            </if>
+            `create_by`,
+            `create_time`
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="standardCode != null">
+                #{standardCode,jdbcType=VARCHAR},
+            </if>
+            <if test="standardName != null">
+                #{standardName,jdbcType=VARCHAR},
+            </if>
+            <if test="standardAlias != null">
+                #{standardAlias,jdbcType=VARCHAR},
+            </if>
+            <if test="englishName != null">
+                #{englishName,jdbcType=BIGINT},
+            </if>
+            <if test="deptName != null">
+                #{deptName,jdbcType=BIGINT},
+            </if>
+            <if test="management != null">
+                #{management,jdbcType=BIGINT},
+            </if>
+            <if test="pId != null">
+                #{pId,jdbcType=BIGINT},
+            </if>
+            #{createBy,jdbcType=BIGINT},
+            #{createTime,jdbcType=TIMESTAMP}
+        </trim>
+    </insert>
+
+    <update id="update"  parameterType="edp.davinci.model.DataSubject">
+        UPDATE data_subject
+        <trim prefix="set" suffixOverrides=",">
+            <if test="standardCode!=null">standard_code=#{standardCode},</if>
+            <if test="standardName!=null">standard_name=#{standardName},</if>
+            <if test="standardAlias!=null">standard_alias=#{standardAlias},</if>
+            <if test="englishName!=null">english_name=#{englishName},</if>
+            <if test="deptName!=null">dept_name=#{deptName},</if>
+            <if test="management!=null">management=#{management},</if>
+            <if test="pId!=null">p_id=#{pId},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+
+</mapper>