From 18dd2f46c4d84142c8273d9f17b87a93f498f83b Mon Sep 17 00:00:00 2001 From: maliang Date: Fri, 17 Mar 2017 16:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/cm/job/SyncFixJob.java | 12 ++- .../src/main/java/com/lyms/cm/job/SyncTmpJob.java | 10 ++ .../sys/impl/SysDepartmentsServiceImpl.java | 2 +- .../src/main/resources/xml/app-shiro.xml | 5 +- .../webapp/WEB-INF/views/depart/depart_edit.html | 118 ++++++--------------- .../webapp/WEB-INF/views/depart/depart_list.html | 28 ++--- .../java/center/manager/test/user/BaseTest.java | 3 +- .../center/manager/test/user/DepartmentsTest.java | 24 +++++ .../com/lyms/web/controller/BaseController.java | 7 +- 9 files changed, 99 insertions(+), 110 deletions(-) create mode 100644 center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java diff --git a/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java b/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java index 6c1e48d..0208329 100644 --- a/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java +++ b/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java @@ -1,5 +1,7 @@ package com.lyms.cm.job; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.slf4j.Logger; @@ -9,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.lyms.sync.ParamsAdpter; import com.lyms.sync.SyncCallback; import com.lyms.sync.SyncCenter; -import com.lyms.sync.SyncHandler; import com.lyms.sync.SyncCenter.Work; +import com.lyms.sync.SyncHandler; import com.lyms.sync.channel.ChannelData; import com.lyms.util.HttpUtils; import com.lyms.util.JsonUtils; @@ -28,7 +30,13 @@ public class SyncFixJob { @Autowired public SyncCenter center; + private final AtomicBoolean reset = new AtomicBoolean(true); + public void excute() { + if (reset.get()) { + return; + } + reset.set(true); // 拉取远端数据 LOG.debug("执行拉取远程数据任务..."); final Work work = center.buildWork(); @@ -69,6 +77,8 @@ public class SyncFixJob { }); } catch (Exception e) { LOG.error("同步数据错误 {}", e); + } finally { + reset.set(false); } } diff --git a/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java b/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java index 5c7437e..f9724b0 100644 --- a/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java +++ b/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java @@ -1,5 +1,7 @@ package com.lyms.cm.job; +import java.util.concurrent.atomic.AtomicBoolean; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,10 +24,16 @@ public class SyncTmpJob { private Logger LOG = LoggerFactory.getLogger(getClass()); + private final AtomicBoolean reset = new AtomicBoolean(true); + @Autowired public SyncCenter center; public void excute() { + if (reset.get()) { + return; + } + reset.set(true); // 拉取远端数据 LOG.debug("执行推送远程数据任务..."); final Work work = center.buildWork(); @@ -49,6 +57,8 @@ public class SyncTmpJob { } catch (Exception e) { LOG.error("同步数据错误 {}", e); work.backPressure(); + } finally { + reset.set(false); } } } diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java index 158f8d4..1bc1027 100644 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java @@ -42,7 +42,7 @@ public class SysDepartmentsServiceImpl extends ServiceImpl 0; } diff --git a/center.manager/src/main/resources/xml/app-shiro.xml b/center.manager/src/main/resources/xml/app-shiro.xml index ab29c88..272c4da 100644 --- a/center.manager/src/main/resources/xml/app-shiro.xml +++ b/center.manager/src/main/resources/xml/app-shiro.xml @@ -45,12 +45,13 @@ - /login = anon + + /** = anon diff --git a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html index 68a7847..9c2f897 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html +++ b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html @@ -2,108 +2,43 @@
- +
- +
+
- +
- - - -
-
- -
- -
- -
-
- - -
- -
- - - +
-
- -
- -
-
-
- -
- -
-
-
- -
- #extends("/organ/org.html") -
-
-
- -
- -
-
- -
- -
- 是 - 否 -
-
- -
+ + 0,"正式运行" 1,"试运行" 2,"停止运行"
-
+
--> +
- +
-
@@ -120,10 +55,10 @@ var data = $('#validForm').serialize(); data = data + "&" + $('#roleForm').serialize(); //console.log(data); - if("$!org.id" == ""){ - ajaxPost(APP.PATH + "/sysOrganizations/create",data); + if("$!depart.id" == ""){ + ajaxPost(APP.PATH + "/sysDepartments/create",data); }else{ - ajaxPost(APP.PATH + "/sysOrganizations/update",data); + ajaxPost(APP.PATH + "/sysDepartments/update",data); } parent.reloadGrid('dataTable'); } @@ -131,10 +66,27 @@ #end #extends("/common/base_list.html") - + diff --git a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html index 9733ac7..c6c2746 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html +++ b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html @@ -41,7 +41,7 @@ function add() { function edit(){ var id = getSingleSelectedValue("dataTable","id"); if(id){ - popWindow("修改部门/科室", APP.PATH + controllerRequestMappint + "toEdit?orgId="+id,700,550); + popWindow("修改部门/科室", APP.PATH + controllerRequestMappint + "toEdit?id="+id,700,550); } } @@ -62,29 +62,23 @@ var default_dataColumns = [{ field: 'name', title: '名称' },{ - field: 'type', - title: '类型' + field: 'orgId', + title: '机构' + },{ + field: 'parentId', + title: '上级部门' },{ field: 'shortCode', title: '简码' },{ - field: 'gradeLevel', - title: '等级' - },{ - field: 'mobile', - title: '服务热线' - },{ - field: 'starLevel', - title: '星级' - },{ - field: 'status', - title: '状态' - },{ field: 'ifdel', title: '是否删除' },{ - field: 'address', - title: '地址' + field: 'created', + title: '创建时间' + },{ + field: 'created', + title: '创建时间' }]; #end diff --git a/center.manager/src/test/java/center/manager/test/user/BaseTest.java b/center.manager/src/test/java/center/manager/test/user/BaseTest.java index 9527b87..dcd8439 100644 --- a/center.manager/src/test/java/center/manager/test/user/BaseTest.java +++ b/center.manager/src/test/java/center/manager/test/user/BaseTest.java @@ -3,9 +3,8 @@ package center.manager.test.user; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.transaction.annotation.Transactional; -@Transactional +//@Transactional @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:app-context.xml" }) public class BaseTest { diff --git a/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java b/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java new file mode 100644 index 0000000..ac50014 --- /dev/null +++ b/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java @@ -0,0 +1,24 @@ +package center.manager.test.user; + +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import com.lyms.cm.entity.sys.SysDepartments; +import com.lyms.cm.service.sys.SysDepartmentsService; +import com.lyms.util.StrUtils; + +public class DepartmentsTest extends BaseTest { + + @Autowired + private SysDepartmentsService departmentService; + + @Test + public void add() { + SysDepartments sysDepartments = new SysDepartments(); + sysDepartments.setId(StrUtils.uuid()); + sysDepartments.setName("测试机构"); + sysDepartments.setOrgId("C1DEC677343843A8A073FB21A796842C"); + departmentService.createDepart(sysDepartments); + } + +} diff --git a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java index ca8765e..45ab821 100644 --- a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java +++ b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java @@ -14,7 +14,6 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.util.StringUtils; import org.springframework.web.bind.ServletRequestDataBinder; @@ -37,10 +36,10 @@ public class BaseController { protected Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired + // @Autowired protected HttpServletRequest request; - @Autowired + // @Autowired protected HttpServletResponse response; @InitBinder @@ -113,7 +112,7 @@ public class BaseController { */ protected Page getPage(int size) { int _size = size, _index = 1; - request =((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); if (request.getParameter("_size") != null) { _size = Integer.parseInt(request.getParameter("_size")); } -- 1.8.3.1