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

融合代码，提交本地

Browse Source 
更新：辅助字典移动到basics目录下，
               修订数据类型条件查询无效bug，
               优化无条件分页查询代码，
               配置编码自增，用户不需手动输入（app强特征作用域功能待添加）；
               无上级，改为根节点，
This commit is contained in:
zhangshilin
2018-03-06 10:36:15 +08:00
parent fc2af8ba04 8f767f7f63
commit a2fb8516c6
53 changed files with 1872 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java
View File

@@ -2,7 +2,6 @@ package com.nis.web.service.configuration;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +28,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.insert(cfg);
@@ -53,7 +52,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.updateByPrimaryKeySelective(cfg);
@@ -77,7 +76,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.audit(cfg);
@@ -101,7 +100,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.updateValid(cfg);

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -29,7 +29,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.insert(baseIpCfg);
@@ -53,7 +53,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg);
@@ -77,7 +77,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.audit(baseIpCfg);
@@ -101,7 +101,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.updateValid(baseIpCfg);

9
src/main/java/com/nis/web/service/configuration/NumCfgService.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.service.configuration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +27,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addNumCfg(NumBoundaryCfg cfg){
return numCfgDao.insert(cfg);
}
@@ -42,7 +41,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateNumCfg(NumBoundaryCfg cfg){
return numCfgDao.updateByPrimaryKeySelective(cfg);
}
@@ -56,7 +55,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditNumCfg(NumBoundaryCfg cfg){
return numCfgDao.audit(cfg);
}
@@ -70,7 +69,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteNumCfg(NumBoundaryCfg cfg){
return numCfgDao.updateValid(cfg);
}

8
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -11,9 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.RequestInfoDao;
import com.nis.web.dao.configuration.TaskInfoDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -23,6 +25,8 @@ public class RequestInfoService extends BaseService{
@Autowired
private RequestInfoDao requestInfoDao;
@Autowired
private TaskInfoDao taskInfoDao;
public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
// 设置分页参数
@@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{
RequestInfo requestInfo=new RequestInfo();
return requestInfoDao.findAllList(requestInfo);
}
public List<TaskInfo> showTask(TaskInfo taskInfo) {
return taskInfoDao.findList(taskInfo);
}
}

8
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -29,7 +29,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.insert(baseStringCfg);
@@ -53,7 +53,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg);
@@ -77,7 +77,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.audit(baseStringCfg);
@@ -101,7 +101,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.updateValid(baseStringCfg);