1.serviceId改为自动获取,不能手动输入

2.修改时serviceId、动作、类型、表类型不可更改
3.增加单域、多域时关联表数量的限制
This commit is contained in:
chenjinsong
2018-03-02 10:13:28 +08:00
parent 75038d900c
commit 6aec4683a5
7 changed files with 169 additions and 18 deletions

View File

@@ -16,7 +16,7 @@ public class SystemServiceInfo extends BaseEntity<SystemServiceInfo> {
private String serviceDesc;//业务描述
private Integer action;//业务动作 1:阻断;2:监测;5:FD白名单;6:监测白名单;7:FD监测白名单;8:灰名单;
private Integer isValid;//有效标识 0:无效;1:有效;
private Integer serviceType;//业务类型 1:常规(单域)业务配置;2:多域业务配置;
private Integer serviceType;//业务类型 1:常规(单域)业务配置;2:多域业务配置;3.特定服务配置;
private SysUser creator;
private Date createTime;
private SysUser editor;
@@ -105,4 +105,13 @@ public class SystemServiceInfo extends BaseEntity<SystemServiceInfo> {
return e.getMessage();
}
}
private Integer serviceIdPre;//辅助用用来存放serviceId前四位以获得最新serviceId
public Integer getServiceIdPre() {
return serviceIdPre;
}
public void setServiceIdPre(Integer serviceIdPre) {
this.serviceIdPre = serviceIdPre;
}
}

View File

@@ -1,6 +1,8 @@
package com.nis.web.controller.systemService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -12,11 +14,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.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.SystemServiceInfo;
import com.nis.util.Collections3;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -30,8 +34,6 @@ public class SystemServiceController extends BaseController {
@ModelAttribute
public SystemServiceInfo get(Long id) {
if (!StringUtil.isEmpty(id)){
// SystemServiceInfo systemServiceInfo = new SystemServiceInfo();
// systemServiceInfo.setId(id);
return systemServiceService.get(id);
}else{
return new SystemServiceInfo();
@@ -123,5 +125,44 @@ public class SystemServiceController extends BaseController {
return "/systemService/list";
}
@ResponseBody
@RequestMapping(value = "serviceIdValidate")
public String serviceIdValidate(String serviceId, Long id) {
List<SystemServiceInfo> list = systemServiceService.getSystemServiceByServiceId(serviceId);
if (Collections3.isEmpty(list)) {
return "true";
} else {
if (id != null) {
if (list.get(0).getId() == id) {
return "true";
} else {
return "false";
}
} else {
return "false";
}
}
}
@ResponseBody
@RequestMapping(value = "newServiceId")
public Integer getNewServiceId(Integer serviceIdPre) {
if (serviceIdPre != null) {
SystemServiceInfo ssi = new SystemServiceInfo();
ssi.setServiceIdPre(serviceIdPre);
List<SystemServiceInfo> list = systemServiceService.findList(ssi);
if (!Collections3.isEmpty(list)) {
Collections.sort(list, new Comparator<SystemServiceInfo>() {
@Override
public int compare(SystemServiceInfo arg0, SystemServiceInfo arg1) {
return arg1.getServiceId().compareTo(arg0.getServiceId());
}
});
return list.get(0).getServiceId() + 1;
} else {
return serviceIdPre * 100;
}
}
return 0;
}
}

View File

@@ -1,5 +1,7 @@
package com.nis.web.dao.systemService;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.SystemServiceInfo;
@@ -8,4 +10,6 @@ import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface SystemServiceInfoDao extends CrudDao<SystemServiceInfo> {
List<SystemServiceInfo> getSystemServiceByServiceId(String serviceId);
}

View File

@@ -47,6 +47,9 @@
<if test="serviceType != null">
and ssi.service_type=#{serviceType}
</if>
<if test="serviceIdPre != null">
and service_id like concat(#{serviceIdPre}, '%')
</if>
</select>
<select id="get" resultMap="systemServiceInfoMap">
@@ -87,6 +90,15 @@
service_id=#{service_id} and is_valid=1
</select>
<select id="getSystemServiceByServiceId" resultType="systemServiceInfo">
select
id
from
system_service_info
where
service_id=#{serviceId} and is_valid=1
</select>
<insert id="insert">
insert into system_service_info (
service_id, service_name, service_desc, action, is_valid, service_type,

View File

@@ -58,4 +58,8 @@ public class SystemServiceService extends CrudService<SystemServiceInfoDao, Syst
}
public List<SystemServiceInfo> getSystemServiceByServiceId(String serviceId) {
return dao.getSystemServiceByServiceId(serviceId);
}
}