Index: forgon-tools/src/main/java/com/forgon/tools/Constants.java =================================================================== diff -u -r13772 -r14284 --- forgon-tools/src/main/java/com/forgon/tools/Constants.java (.../Constants.java) (revision 13772) +++ forgon-tools/src/main/java/com/forgon/tools/Constants.java (.../Constants.java) (revision 14284) @@ -93,5 +93,8 @@ public static String CHARSET_UTF8 = "UTF-8"; public static String CHARSET_utf8 = "utf-8"; + public static final String SOURCE_MANUAL = "手工"; + public static final String SOURCE_SYNC = "同步"; + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java =================================================================== diff -u -r14209 -r14284 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 14209) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 14284) @@ -33,6 +33,7 @@ import com.forgon.security.service.UserManager; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; +import com.forgon.tools.Constants; import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; import com.forgon.tools.db.DatabaseUtil; @@ -152,7 +153,7 @@ @Override public boolean evaluate(OrgUnitVo newOrgUnit) { if (StringUtils.equals(orgUnit.getOrgUnitCoding(), newOrgUnit.coding) || - OrgUnit.SOURCE_MANUAL.equals(orgUnit.getSource())) { //手动就不给他删除(陈家儒改) + Constants.SOURCE_MANUAL.equals(orgUnit.getSource())) { //手动就不给他删除(陈家儒改) return true; } else { return false; @@ -202,7 +203,7 @@ orgUnit = new OrgUnit(); orgUnit.setOrgUnitCoding(vo.coding);// 部门编码 orgUnit.setOrgForeignKey(vo.coding);// 部门外部ID - orgUnit.setSource(OrgUnit.SOURCE_SYNC); //是同步添加的数据(陈家儒改) + orgUnit.setSource(Constants.SOURCE_SYNC); //是同步添加的数据(陈家儒改) orgUnit.setBarcodeDevice(newBarcodeOfOrgUnit()); } @@ -232,7 +233,7 @@ @Override public boolean evaluate(UserVo newUser) { return StringUtils.equals(user.getName(), newUser.coding) || - OrgUnit.SOURCE_MANUAL.equals(user.getSource()); + Constants.SOURCE_MANUAL.equals(user.getSource()); } }); if(!existsInNewUsers){ @@ -278,7 +279,7 @@ public boolean evaluate(UserVo vo) { if (StringUtils.equals(userVo.getCoding(), vo.coding) && StringUtils.equals(userVo.getOrgUnitCoding(), vo.orgUnitCoding) && - User.SOURCE_MANUAL.equals(userVo.getSource())) { + Constants.SOURCE_MANUAL.equals(userVo.getSource())) { return true; } else { return false; Index: forgon-core/src/main/java/com/forgon/security/model/User.java =================================================================== diff -u -r14209 -r14284 --- forgon-core/src/main/java/com/forgon/security/model/User.java (.../User.java) (revision 14209) +++ forgon-core/src/main/java/com/forgon/security/model/User.java (.../User.java) (revision 14284) @@ -28,6 +28,7 @@ import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.model.OrgUserRelation; +import com.forgon.tools.Constants; import com.forgon.tools.string.StringTools; @Entity @@ -139,12 +140,8 @@ /** * 数据来源(陈家儒改) */ - private String source = SOURCE_MANUAL; //默认手工 + private String source = Constants.SOURCE_MANUAL; //默认手工 - public static final String SOURCE_MANUAL = "手工"; - public static final String SOURCE_SYNC = "同步"; - - public String getPasswd() { return this.passwd; } Index: forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java =================================================================== diff -u -r14209 -r14284 --- forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java (.../OrgUnit.java) (revision 14209) +++ forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java (.../OrgUnit.java) (revision 14284) @@ -90,11 +90,9 @@ /** * 数据来源(陈家儒改) */ - private String source = SOURCE_MANUAL; //默认手工 + private String source = Constants.SOURCE_MANUAL; //默认手工 + - public static final String SOURCE_MANUAL = "手工"; - public static final String SOURCE_SYNC = "同步"; - public String getDescription() { return description;