3.8号bug修改

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

@@ -52,25 +52,15 @@ public interface DictTypeMapper
     })
     int update(DictType dictType);
 
-    @Select({"select id from `dict_type` where  dict_name = #{dictName}"})
+    @Select({"select dict_id from `dict_type` where  dict_name = #{dictName}"})
     Long getByNameWithProjectId(@Param("dictName") String dictName);
 
+    @Select({"select dict_id from `dict_type` where  dict_type = #{dictType}"})
+    Long getByDictType(@Param("dictType") String dictType);
+
     @Select({"select * from `dict_type`"})
     List<DictType> getDictTypeList();
 
-    @Select({
-            "SELECT s.id, s.`name`, s.`type`, s.`config`,",
-            "	p.id 'project.id',",
-            "	p.`name` 'project.name',",
-            "	p.`description` 'project.description',",
-            "	p.`pic` 'project.pic',",
-            "	p.`user_id` 'project.userId',",
-            "	p.`org_id` 'project.orgId',",
-            "	p.`visibility` 'p.visibility'",
-            "FROM source s INNER JOIN project p on p.id = s.project_id",
-            "where s.id = #{sourceId}"
-    })
-//    SourceWithProject getSourceWithProjectById(@Param("sourceId") Long sourceId);
 
     int insertBatch(@Param("list") List<DictType> dictTypeList);
 

server/src/main/java/edp/davinci/model/DictData.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+
 /**
  * 字典数据
  */
@@ -33,6 +35,8 @@ public class DictData extends RecordInfo<DictData>
     //0=正常,1=停用
     private Integer status;
 
+    private Date createTime;
+
     // 备注
     private String remark;
 

server/src/main/java/edp/davinci/model/DictType.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+
 /**
  * 字典类型
  */
@@ -23,6 +25,7 @@ public class DictType extends RecordInfo<DictType>
     // 字典状态 0=正常,1=停用
     private Integer status;
 
+    private Date createTime;
     // 备注
     private String remark;
 }

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

@@ -41,7 +41,7 @@ public interface DictService extends CheckEntityService {
 
     List<DictData> getDictData(String dictType);
 
-    DictType createDictType(DictType dictType);
+    DictType createDictType(DictType dictType) throws ServerException;
 
     DictData createDictData(DictData dictData);
 

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

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -51,8 +52,14 @@ public class DictServiceImpl implements DictService
     }
 
     @Override
-    public DictType createDictType(DictType dictType)
+    public DictType createDictType(DictType dictType) throws ServerException
     {
+        Long sourceId = dictTypeMapper.getByDictType(dictType.getDictType());
+        if ( null != sourceId)
+        {
+            throw new ServerException("字典类型已存在;dictType:" + dictType.getDictType());
+        }
+        dictType.setCreateTime(new Date());
         dictTypeMapper.insert(dictType);
 
         return dictType;
@@ -61,6 +68,7 @@ public class DictServiceImpl implements DictService
     @Override
     public DictData createDictData(DictData dictData)
     {
+        dictData.setCreateTime(new Date());
         dictDataMapper.insert(dictData);
 
         return dictData;