修复mapper.xml中expr_type字段带的空格

ServiceConfigInfo添加列表查询
IP,字符串,增强字符串配置修复创建时间创建人在更新的时候覆盖的bug

src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java

@@ -186,8 +186,8 @@ public class ComplexStringCfgController extends BaseController{
 		}else if(!StringUtils.isBlank(cfg.getTableName())){
 			int serviceId=cfg.getServiceId();
 			long compileId=getCompileId(cfg);
-			cfg.setCreatorId(cfg.getCurrentUser().getId());
+//			cfg.setCreatorId(cfg.getCurrentUser().getId());
-			cfg.setCreateTime(new Date());
+//			cfg.setCreateTime(new Date());
 			cfg.setIsValid(Constants.VALID_NO);
 			cfg.setIsAudit(Constants.AUDIT_NOT_YET);
 			cfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{
 				if(!StringUtils.isBlank(tableName)){
 					long compileId=getCompileId(cfg);
 					cfg.setTableName(tableName);
-					cfg.setCreatorId(cfg.getCurrentUser().getId());
+//					cfg.setCreatorId(cfg.getCurrentUser().getId());
-					cfg.setCreateTime(new Date());
+//					cfg.setCreateTime(new Date());
 					cfg.setIsValid(Constants.VALID_NO);
 					cfg.setIsAudit(Constants.AUDIT_NOT_YET);
 					cfg.setCompileId(compileId);

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -262,8 +262,8 @@ public class IpCfgController extends BaseController{
 				if(!StringUtils.isBlank(tableName)){
 					long compileId=getCompileId();
 					ipCfg.setTableName(tableName);
-					ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
+//					ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
-					ipCfg.setCreateTime(new Date());
+//					ipCfg.setCreateTime(new Date());
 					ipCfg.setIsValid(Constants.VALID_NO);
 					ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
 					ipCfg.setCompileId(compileId);

src/main/java/com/nis/web/controller/configuration/NumCfgController.java

@@ -144,8 +144,8 @@ public class NumCfgController extends BaseController{
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 			if(serviceConfigInfo!=null){
 					long compileId=getCompileId(cfg);
-					cfg.setCreatorId(cfg.getCurrentUser().getId());
+//					cfg.setCreatorId(cfg.getCurrentUser().getId());
-					cfg.setCreateTime(new Date());
+//					cfg.setCreateTime(new Date());
 					cfg.setIsValid(Constants.VALID_NO);
 					cfg.setIsAudit(Constants.AUDIT_NOT_YET);
 					cfg.setCompileId(compileId);

src/main/java/com/nis/web/controller/configuration/StringCfgController.java

@@ -186,8 +186,8 @@ public class StringCfgController extends BaseController{
 		}else if(!StringUtils.isBlank(stringCfg.getTableName())){
 			int serviceId=stringCfg.getServiceId();
 			long compileId=getCompileId(stringCfg);
-			stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
+//			stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
-			stringCfg.setCreateTime(new Date());
+//			stringCfg.setCreateTime(new Date());
 			stringCfg.setIsValid(Constants.VALID_NO);
 			stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
 			stringCfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{
 				if(!StringUtils.isBlank(tableName)){
 					long compileId=getCompileId(stringCfg);
 					stringCfg.setTableName(tableName);
-					stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
+//					stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
-					stringCfg.setCreateTime(new Date());
+//					stringCfg.setCreateTime(new Date());
 					stringCfg.setIsValid(Constants.VALID_NO);
 					stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
 					stringCfg.setCompileId(compileId);

src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml

@@ -22,7 +22,7 @@
     <result column="classify" property="classify" jdbcType="VARCHAR" />
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
-    <result column="expr_type " property="exprType" jdbcType="INTEGER" />
+    <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />

src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml

@@ -22,7 +22,7 @@
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
-    <result column="expr_type " property="exprType" jdbcType="INTEGER" />
+    <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
   </resultMap>
@@ -47,7 +47,7 @@
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
-    <result column="expr_type " property="exprType" jdbcType="INTEGER" />
+    <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />

src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java

@@ -1,5 +1,7 @@
 package com.nis.web.dao.systemService;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.ServiceConfigInfo;
@@ -8,4 +10,5 @@ import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface ServiceConfigInfoDao extends CrudDao<ServiceConfigInfo>{
 	public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId);
+	public List<ServiceConfigInfo> findList(@Param("service_id")int serviceId);
 }

src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml

@@ -26,6 +26,20 @@
 		where
 			service_id=#{service_id} and is_valid=1
 	</select>
+	<select id="findList" resultMap="serviceConfigInfo">
+		select
+			id,
+			table_name,
+			table_desc,
+			table_type,
+			maat_table,
+			service_id,
+			is_valid
+		from
+			service_config_info
+		where
+			service_id=#{service_id} and is_valid=1
+	</select>
 
 	<insert id="insert">
 		insert into service_config_info (

src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java

@@ -1,5 +1,7 @@
 package com.nis.web.service.systemService;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,4 +15,7 @@ public class ServiceConfigInfoService {
 	public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){
 		return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId);
 	}
+	public List<ServiceConfigInfo> findList(int serviceId){
+		return serviceConfigInfoDao.findList(serviceId);
+	}
 }