gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app主题网站增加关联关系

Browse Source
This commit is contained in:
zhanghongqing
2018-08-29 22:46:49 +08:00
parent dd59389e0a
commit 5335703255
11 changed files with 483 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
View File

@@ -28,12 +28,12 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
@Expose
private String ratelimit;
// private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
private Long websiteServiceId;//specific_service_cfg表二级节点的spec_service_code
private Integer specServiceId;
private String domain;
private String cfgKeywords;
private String appName;
private String topic;
private Long topicId;
@Expose
@ExcelField(title="expression_type")
@@ -51,12 +51,14 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
protected Integer isHexbin;
public String getTopic() {
return topic;
public Long getTopicId() {
return topicId;
}
public void setTopic(String topic) {
this.topic = topic;
public void setTopicId(Long topicId) {
this.topicId = topicId;
}
public Integer getExprType() {
@@ -142,12 +144,12 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
this.appName = appName;
}
public Integer getBehavCode() {
return behavCode;
public Long getWebsiteServiceId() {
return websiteServiceId;
}
public void setBehavCode(Integer behavCode) {
this.behavCode = behavCode;
public void setWebsiteServiceId(Long websiteServiceId) {
this.websiteServiceId = websiteServiceId;
}
}

59
src/main/java/com/nis/domain/configuration/WebsiteDomainTopic.java Normal file
View File

@@ -0,0 +1,59 @@
package com.nis.domain.configuration;
import java.util.Date;
public class WebsiteDomainTopic {
private Long id; // `id` bigint(20) NOT NULL AUTO_INCREMENT,
private Long websiteServiceId; // `website_service_id` bigint(20) DEFAULT NULL COMMENT '网站服务Id',
private String domain; // `domain` varchar(200) DEFAULT NULL COMMENT '域名',
private Long topicId; // `topic_id` bigint(20) DEFAULT NULL COMMENT '主题Id',
private Date createTime; // `create_time` timestamp NULL DEFAULT NULL ON UPDATE current_timestamp(),
private Integer creatorId; // `creator_id` int(11) DEFAULT NULL,
private Integer isValid; // `is_valid` int(1) DEFAULT NULL,
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getWebsiteServiceId() {
return websiteServiceId;
}
public void setWebsiteServiceId(Long websiteServiceId) {
this.websiteServiceId = websiteServiceId;
}
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
public Long getTopicId() {
return topicId;
}
public void setTopicId(Long topicId) {
this.topicId = topicId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getCreatorId() {
return creatorId;
}
public void setCreatorId(Integer creatorId) {
this.creatorId = creatorId;
}
public Integer getIsValid() {
return isValid;
}
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
}

76
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -4,11 +4,13 @@ import java.io.File;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.POST;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,10 +18,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.nis.domain.Page;
import com.nis.domain.SysDataDictionaryItem;
@@ -35,6 +40,7 @@ import com.nis.domain.configuration.AppTcpCfg;
import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.configuration.AppBuiltInFeatureFile;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData;
@@ -1017,23 +1023,35 @@ public class AppCfgController extends BaseController {
public String TopicDomainCfgList(Model model,@ModelAttribute("cfg")AppTopicDomainCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppTopicDomainCfg> searchPage=new Page<AppTopicDomainCfg>(request,response,"r");
Page<AppTopicDomainCfg> page = appCfgService.findAppTopicDomainList(searchPage, cfg);
// for(AppTopicDomainCfg entity:page.getList()){
// SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
// entity.setAppName(app.getSpecServiceName());
// }
//设置topic主题
for (AppTopicDomainCfg entity:page.getList()) {
List<CodeResult> codeList = CodeDicUtils.getCodeList("serviceCode");
for (CodeResult codeResult : codeList) {
if(null!=entity.getTopic()&&codeResult.getCode().equals(entity.getTopic())){
entity.setAppName(codeResult.getItem());
}
}
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/app/appTopicDomainCfgList";
}
/**
*
* 获取服务与主题关系表中的域名
* @param websiteDomainTopic
* @param response
* @return
*/
@ResponseBody
@RequestMapping(value = "WebsiteDomainTopicList",method=RequestMethod.GET)
public List<Map<String, Object>> WebsiteDomainTopicList(@ModelAttribute("websiteDomainTopic")WebsiteDomainTopic websiteDomainTopic,@RequestParam("websiteServiceId") Long websiteServiceId,@RequestParam("topicId") Long topicId,HttpServletResponse response){
List<Map<String, Object>> mapList = Lists.newArrayList();
if(websiteServiceId!=null&&topicId!=null){
List<WebsiteDomainTopic> list = appCfgService.getDomainDict(websiteDomainTopic);
if(list!=null&&list.size()>0){
for (WebsiteDomainTopic domain : list) {
Map<String, Object> map = Maps.newHashMap();
map.put("domain",domain.getDomain());
map.put("domainId",domain.getId());
mapList.add(map);
}
}
}
return mapList;
}
/**
* app主题网站配置表单
* @param model
@@ -1065,12 +1083,34 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = {"saveAppTopicDomainCfg"})
@RequiresPermissions(value={"app:topic:config"})
public String saveAppTopicDomainCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppTopicDomainCfg entity,RedirectAttributes redirectAttributes) {
AppTopicDomainCfg entity,@RequestParam("userDomain")String userDomain,RedirectAttributes redirectAttributes) {
try {
// SpecificServiceCfg specificService = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
// if(specificService!=null){
// entity.setAppCode(specificService.getSpecServiceCode());
// }
//验证域名的重复行
if(!StringUtil.isBlank(userDomain)){
WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
websiteDomainTopic.setDomain(userDomain);
List<WebsiteDomainTopic> domainDict = appCfgService.getDomainDict(websiteDomainTopic);
if((domainDict!=null&&domainDict.size()>0)){
addMessage(redirectAttributes,"domain_existed");
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+entity.getFunctionId();
}else{
//保存到域名关联表中
if(entity!=null&&entity.getWebsiteServiceId()!=null&&entity.getTopicId()!=null){
websiteDomainTopic.setWebsiteServiceId(entity.getWebsiteServiceId());
websiteDomainTopic.setTopicId(entity.getTopicId());
websiteDomainTopic.setCreateTime(new Date());
websiteDomainTopic.setCreatorId(Integer.valueOf(UserUtils.getUser().getId().toString()));
websiteDomainTopic.setIsValid(Constants.VALID_YES);
appCfgService.saveDomainDict(websiteDomainTopic);
}else{
addMessage(redirectAttributes,"save_failed");
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+entity.getFunctionId();
}
}
}
if(entity!=null&&StringUtil.isBlank(entity.getDomain())&&!StringUtil.isBlank(userDomain)){
entity.setDomain(userDomain);//自定义域名
}
appCfgService.saveOrUpdateAppTopicDomainCfg(entity);
addMessage(redirectAttributes,"save_success");
} catch (Exception e) {

4
src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@@ -94,4 +95,7 @@ public interface AppCfgDao {
//修改配置状态
public void updateCfgValid(BaseCfg entity);
public void deleteSubscribeIdCfg(AppPolicyCfg entity);
//域名关联表操作
public List<WebsiteDomainTopic> getDomainDict(WebsiteDomainTopic websiteDomainTopic);
public void saveDomainDict(WebsiteDomainTopic websiteDomainTopic);
}

81
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -140,8 +140,8 @@
<resultMap id="AppTopicDomainCfgMap" type="com.nis.domain.configuration.AppTopicDomainCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
<result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
<result column="topic" property="topic" jdbcType="VARCHAR" />
<result column="behav_code" property="behavCode" jdbcType="INTEGER" />
<result column="topic_id" property="topicId" jdbcType="BIGINT" />
<result column="website_service_id" property="websiteServiceId" jdbcType="BIGINT" />
<result column="domain" property="domain" jdbcType="VARCHAR" />
<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
<result column="action" property="action" jdbcType="INTEGER" />
@@ -357,7 +357,19 @@
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
<resultMap id="WebsiteDomainTopicMap" type="com.nis.domain.configuration.WebsiteDomainTopic" >
<id column="id" property="id" jdbcType="BIGINT" />
<result column="website_service_id" property="websiteServiceId" jdbcType="BIGINT" />
<result column="domain" property="domain" jdbcType="VARCHAR" />
<result column="topic_id" property="topicId" jdbcType="BIGINT" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
</resultMap>
<sql id="WebsiteDomainTopic_Column">
id,website_service_id websiteServiceId,domain,topic_id topicId,create_time createTime,creator_id creatorId,is_valid isValid
</sql>
<sql id="AppTcpCfg_Column" >
r.CFG_ID, r.APP_CODE,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
@@ -402,7 +414,7 @@
</sql>
<sql id="AppTopicDomainCfg_Column" >
r.CFG_ID, r.TOPIC,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
r.CFG_ID, r.TOPIC_ID,r.WEBSITE_SERVICE_ID,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
@@ -436,7 +448,7 @@
#{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
</sql>
<sql id="AppTopicCommonCfg_Value_List" >
#{topic,jdbcType=VARCHAR},#{behavCode,jdbcType=INTEGER},#{specServiceId,jdbcType=INTEGER},
#{topicId,jdbcType=BIGINT},#{websiteServiceId,jdbcType=BIGINT},#{specServiceId,jdbcType=INTEGER},
#{cfgDesc,jdbcType=VARCHAR},#{action,jdbcType=INTEGER},
#{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP},
@@ -1728,7 +1740,7 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into app_topic_domain_cfg (
TOPIC,BEHAV_CODE,SPEC_SERVICE_ID,CFG_DESC,ACTION,IS_VALID,IS_AUDIT,
TOPIC_ID,WEBSITE_SERVICE_ID,SPEC_SERVICE_ID,CFG_DESC,ACTION,IS_VALID,IS_AUDIT,
CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
@@ -2306,11 +2318,11 @@
<if test="cfgDesc != null and cfgDesc != ''" >
cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
</if>
<if test="topic != null">
TOPIC = #{topic,jdbcType=VARCHAR},
<if test="topicId != null">
TOPIC_ID = #{topicId,jdbcType=BIGINT},
</if>
<if test="behavCode != null">
BEHAV_CODE = #{behavCode,jdbcType=INTEGER},
<if test="websiteServiceId != null">
WEBSITE_SERVICE_ID = #{websiteServiceId,jdbcType=BIGINT},
</if>
<if test="specServiceId != null">
SPEC_SERVICE_ID = #{specServiceId,jdbcType=INTEGER},
@@ -2839,4 +2851,53 @@
<include refid="IpCfg_Column" />
FROM ip_port_cfg a where compile_id=#{compileId} and function_id=#{functionId}
</select>
<!-- 查询域名关联表 -->
<select id="getDomainDict" resultMap="WebsiteDomainTopicMap" parameterType="com.nis.domain.configuration.WebsiteDomainTopic" >
select
<include refid="WebsiteDomainTopic_Column"/>
from website_domain_topic r
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="id != null">
AND r.id=#{id,jdbcType=BIGINT}
</if>
<if test="websiteServiceId != null">
AND r.website_service_id=#{websiteServiceId,jdbcType=BIGINT}
</if>
<if test="topicId != null">
AND r.topic_id=#{topicId,jdbcType=BIGINT}
</if>
<if test="domain != null and domain !=''">
AND r.domain=#{domain,jdbcType=VARCHAR}
</if>
<if test="isValid != null">
AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
</if>
<if test="isValid == null">
AND r.IS_VALID != -1
</if>
<if test="createTime != null and createTime != ''">
AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
</if>
<!-- 数据范围过滤 -->
<!-- ${sqlMap.dsf} -->
</trim>
</select>
<!--saveDomainDict -->
<insert id="saveDomainDict" parameterType="com.nis.domain.configuration.WebsiteDomainTopic" >
<selectKey resultType="java.lang.Long" order="AFTER" keyProperty="id">
SELECT LAST_INSERT_ID()
</selectKey>
insert into website_domain_topic (
website_service_id,domain,topic_id,create_time,creator_id,is_valid
)values (
#{websiteServiceId},
#{domain},
#{topicId},
#{createTime},
#{creatorId},
#{isValid}
)
</insert>
</mapper>

31
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -1219,9 +1220,15 @@ public class AppCfgService extends BaseService {
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
// 设置APP自定义域
// 设置APP自定义域
String domain = entity.getDomain();
WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
websiteDomainTopic.setDomain(domain);
//查询domainId
List<WebsiteDomainTopic> domainDict = appCfgDao.getDomainDict(websiteDomainTopic);
Long domainId = domainDict.get(0).getId();
// "APP_ID="+entity.getAppCode()+Constants.USER_REGION_SPLIT+
String userRegion = "DOMAIN_ID=" + entity.getCompileId() + Constants.USER_REGION_SPLIT + "DOMAIN_STR="
String userRegion = "DOMAIN_ID=" + domainId + Constants.USER_REGION_SPLIT + "DOMAIN_STR="
+ keywordsEscape(entity.getDomain());
maatCfg.setUserRegion(userRegion);
@@ -1797,4 +1804,24 @@ public class AppCfgService extends BaseService {
logger.info("app Header配置取消配置响应信息：" + result.getMsg());
}
}
/**
* 获取主题跟服务表中的域名
* @param websiteDomainTopic
* @return
*/
public List<WebsiteDomainTopic> getDomainDict(WebsiteDomainTopic websiteDomainTopic) {
return appCfgDao.getDomainDict(websiteDomainTopic);
}
/**
* 保存自定义的域名
* @param websiteDomainTopic
*/
@Transactional(readOnly = false, rollbackFor = RuntimeException.class)
public void saveDomainDict(WebsiteDomainTopic websiteDomainTopic) {
appCfgDao.saveDomainDict(websiteDomainTopic);
}
}