salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-deploy

Browse Source
This commit is contained in:
Salman Manoe 2023-10-11 23:28:57 +07:00
commit 32dbdeb171
3 changed files with 46 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/LoginUserAuthConverter.java
View File

@ -1,21 +1,15 @@
package com.jasamedika.medifirst2000.converter;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
import com.jasamedika.medifirst2000.dao.custom.base.impl.FindConverterDao;
import com.jasamedika.medifirst2000.entities.KelompokUser;
import com.jasamedika.medifirst2000.entities.LoginUser;
import com.jasamedika.medifirst2000.service.KelompokUserService;
import com.jasamedika.medifirst2000.service.PegawaiService;
import com.jasamedika.medifirst2000.util.ExtendedSpringBeanUtil;
import com.jasamedika.medifirst2000.vo.KelompokUserVO;
import com.jasamedika.medifirst2000.vo.LoginUserVO;
import com.jasamedika.medifirst2000.vo.PegawaiVO;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
/**
* Converter class between LoginUser and LoginUserVO
@ -23,85 +17,22 @@ import com.jasamedika.medifirst2000.vo.PegawaiVO;
* @author Roberto
*/
@Component
public class LoginUserAuthConverter extends FindConverterDao implements
BaseVoConverter<LoginUserVO, LoginUser> {
/*
@Override
public class LoginUserAuthConverter extends FindConverterDao implements BaseVoConverter<LoginUserVO, LoginUser> {
public LoginUser transferVOToModel(LoginUserVO vo, LoginUser model) {
if (null == model)
model = new LoginUser();
try {
String[] fieldsToInclude = null;
Map<String, Object> serialized = vo.serialize(fieldsToInclude,vo.getClass().getName());
Gson gson = new Gson();
String json = gson.toJson(serialized);
model = gson.fromJson(json, LoginUser.class);
} catch (Exception e) {
e.printStackTrace();
}
return model;
}
@Override
public List<LoginUserVO> transferListOfModelToListOfVO(List<LoginUser> models, List<LoginUserVO> vos) {
if (null == vos)
vos = new ArrayList<LoginUserVO>();
if (null == models)
return vos;
for (LoginUser loginUser : models) {
LoginUserVO vo = new LoginUserVO();
vo=transferModelToVO(loginUser, vo);
vos.add(vo);
}
return vos;
}
@Override
public LoginUserVO transferModelToVO(LoginUser model, LoginUserVO vo) {
if (null == vo)
vo = new LoginUserVO();
try {
String[] fieldsToInclude = null;
Map<String, Object> serialized = model.serialize(fieldsToInclude,model.getClass().getSimpleName());
Gson gson = new Gson();
String json = gson.toJson(serialized);
vo = gson.fromJson(json, LoginUserVO.class);
} catch (Exception e) {
e.printStackTrace();
}
return vo;
}
*/
public LoginUser transferVOToModel(LoginUserVO vo, LoginUser model) {
if (null == model)
model = new LoginUser();
// fix this
ExtendedSpringBeanUtil.copySpecificProperties(vo, model, new String[] {
"id", "kataSandi", "namaUser", }, new String[] { "id",
"kataSandi", "namaUser", });
ExtendedSpringBeanUtil.copySpecificProperties(vo, model, new String[] { "id", "kataSandi", "namaUser", },
new String[] { "id", "kataSandi", "namaUser", });
if (vo.getKelompokUser() != null) {
KelompokUser kelompokUser = (KelompokUser) findObjectById(
KelompokUser.class, vo.getKelompokUser().getId());
KelompokUser kelompokUser = (KelompokUser) findObjectById(KelompokUser.class, vo.getKelompokUser().getId());
model.setKelompokUser(kelompokUser);
}
return model;
}
public List<LoginUserVO> transferListOfModelToListOfVO(
List<LoginUser> models, List<LoginUserVO> vos) {
public List<LoginUserVO> transferListOfModelToListOfVO(List<LoginUser> models, List<LoginUserVO> vos) {
if (null == vos)
vos = new ArrayList<LoginUserVO>();
vos = new ArrayList<>();
if (null == models)
return vos;
@ -110,35 +41,14 @@ public class LoginUserAuthConverter extends FindConverterDao implements
transferModelToVO(loginUser, loginUserVO);
vos.add(loginUserVO);
}
return vos;
}
public LoginUserVO transferModelToVO(LoginUser model, LoginUserVO vo) {
if (null == vo)
vo = new LoginUserVO();
// fix this
ExtendedSpringBeanUtil.copySpecificProperties(model, vo, new String[] {
"id", "kataSandi", "namaUser", }, new String[] { "id",
"kataSandi", "namaUser", });
if (model.getKelompokUser() != null) {
KelompokUserVO kelompokUserVo = kelompokUserService.findById(model
.getKelompokUser().getId());
vo.setKelompokUser(kelompokUserVo);
}
if (model.getPegawai() != null) {
PegawaiVO kelompokUserVo = pgawaiService.findById(model
.getPegawai().getId());
vo.setPegawai(kelompokUserVo);
}
ExtendedSpringBeanUtil.copySpecificProperties(model, vo, new String[] { "id", "kataSandi", "namaUser", },
new String[] { "id", "kataSandi", "namaUser", });
return vo;
}
@Autowired
private KelompokUserService kelompokUserService;
@Autowired
private PegawaiService pgawaiService;
}

1
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ActivityPegawaiServiceImpl.java
View File

@ -96,7 +96,6 @@ public class ActivityPegawaiServiceImpl implements ActivityPegawaiService {
act.setTanggalKejadian(new Date());
act = activityPegawaiDao.save(act);
act = activityPegawaiDao.findOne(act.getNoRec());
act.setPegawai(pegawaiDao.findById(pegawai.getId()));
try {
BroadcastMessage("IKI", act.ToMap());
} catch (IllegalArgumentException | IllegalAccessException e) {

111
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LoginUserServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.service.impl;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.converter.LoginUserAuthConverter;
import com.jasamedika.medifirst2000.converter.LoginUserConverter;
import com.jasamedika.medifirst2000.dao.HistoryLoginModulAplikasiDao;
import com.jasamedika.medifirst2000.dao.LoginUserDao;
import com.jasamedika.medifirst2000.dao.MapPegawaiToModulAplikasiDao;
@ -30,7 +29,6 @@ import java.util.*;
@Service("LoginUserService")
public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUserService {
private static final Logger LOGGER = LoggerFactory.getLogger(LoginUserServiceImpl.class);
@Autowired
@ -43,10 +41,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
private LoginUserAuthConverter loginUserAuthConverter;
@Autowired
private LoginUserConverter loginUserConverter;
@Autowired
private BaseConverterImpl<LoginUserVO, LoginUser> loginUserConverters;
private BaseConverterImpl<LoginUserVO, LoginUser> loginUserConverter;
@Autowired
private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
@ -103,7 +98,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
}
@Override
@Transactional(readOnly = false)
@Transactional
public LoginUserVO add(LoginUserVO vo) throws JpaSystemException, ServiceVOException {
// convert to model and call repository
LoginUser loginUser = new LoginUser();
@ -113,7 +108,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
try {
loginUser.setKataSandi(passwordUtil.encryptPassword(loginUser.getKataSandi()));
} catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
e.printStackTrace();
throw new ServiceVOException(e.getMessage());
}
LoginUser resultModel = loginUserDao.save(loginUser);
@ -126,7 +121,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
}
@Override
@Transactional(readOnly = false)
@Transactional
public LoginUserVO update(LoginUserVO vo) throws JpaSystemException, ServiceVOException {
// Alter Syamsu
@ -139,7 +134,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
try {
loginUserLama.setKataSandi(passwordUtil.encryptPassword(loginUserLama.getKataSandi()));
} catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
e.printStackTrace();
throw new ServiceVOException(e.getMessage());
}
loginUserDao.save(loginUserLama);
@ -152,7 +147,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
}
@Override
@Transactional(readOnly = false)
@Transactional
public Boolean delete(Integer key) throws JpaSystemException {
if (loginUserDao.exists(key)) {
loginUserDao.delete(key);
@ -180,7 +175,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
List<LoginUser> loginUserList = IteratorUtils.toList(loginUserDao.findAll().iterator());
List<LoginUserVO> loginUserVOList = new ArrayList<LoginUserVO>();
List<LoginUserVO> loginUserVOList = new ArrayList<>();
loginUserConverter.transferListOfModelToListOfVO(loginUserList, loginUserVOList);
return loginUserVOList;
@ -202,7 +197,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
LoginUser loginUser = loginUsers.get(0);
PasswordUtil passwordUtil = new PasswordUtil();
Boolean isValidPassword = false;
boolean isValidPassword;
try {
isValidPassword = passwordUtil.isPasswordEqual(authVO.getKataSandi(), loginUser.getKataSandi());
} catch (IOException ioe) {
@ -214,11 +209,19 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
return null;
}
// to do validasi yang advanced di sini
LoginUserVO vo = new LoginUserVO();
loginUserAuthConverter.transferModelToVO(loginUser, vo);
vo = loginUserAuthConverter.transferModelToVO(loginUser, vo);
if (CommonUtil.isNotNullOrEmpty(loginUser.getKelompokUser())) {
KelompokUserVO kelompokUserVO = new KelompokUserVO();
kelompokUserVO = kelompokUserConverter.transferModelToVO(loginUser.getKelompokUser(), kelompokUserVO);
vo.setKelompokUser(kelompokUserVO);
}
if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
PegawaiVO pegawaiVO = new PegawaiVO();
pegawaiVO = pegawaiConverter.transferModelToVO(loginUser.getPegawai(), pegawaiVO);
vo.setPegawai(pegawaiVO);
}
return vo;
} else {
throw new RuntimeException("User account is unauthorized : username : " + authVO.getNamaUser());
}
@ -226,22 +229,20 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
@Override
public LoginUser getLoginUser() {
List<LoginUser> loginUser = null;
try {
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String namaUser = principal.toString();
loginUser = loginUserDao.findByNamaUser(namaUser);
List<LoginUser> loginUser = loginUserDao.findByNamaUser(namaUser);
return loginUser.get(0);
} catch (Exception e) {
e.printStackTrace();
throw new ServiceVOException(e.getMessage());
}
return loginUser.get(0);
}
@Override
public Map<String, Object> getAllUser() {
Map<String, Object> result = new HashMap<String, Object>();
List<LoginUser> list = new ArrayList<LoginUser>();
list = (List<LoginUser>) loginUserDao.findAllUser();
Map<String, Object> result = new HashMap<>();
List<LoginUser> list = loginUserDao.findAllUser();
if (CommonUtil.isNotNullOrEmpty(list)) {
result.put("data", list);
result.put("dataFound", true);
@ -251,12 +252,9 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
return result;
}
// Reza
// -----------------------------------------------------------------------------------------------
@Override
public Map<String, Object> getLoadData() {
Map<String, Object> result = new HashMap<String, Object>();
Map<String, Object> result = new HashMap<>();
// --------------------------------------------------------------------------
List<Map<String, Object>> listPegawai = loginUserDao.listPegawai();
if (CommonUtil.isNotNullOrEmpty(listPegawai)) {
@ -348,7 +346,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
}
}
} catch (Exception ex) {
ex.printStackTrace();
throw new ServiceVOException(ex.getMessage());
}
return listSideMenu;
}
@ -366,7 +364,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
LoginUser loginUser = new LoginUser();
if (CommonUtil.isNotNullOrEmpty(vo)) {
loginUser = loginUserConverters.transferVOToModel(vo, new LoginUser());
loginUser = loginUserConverter.transferVOToModel(vo, new LoginUser());
loginUser.setKdProfile((short) 0);
loginUser.setStatusEnabled(true);
loginUser.setKodeExternal("");
@ -381,7 +379,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
try {
loginUser.setKataSandi(new PasswordUtil().encryptPassword(vo.getKataSandi()));
} catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
e.printStackTrace();
throw new ServiceVOException(e.getMessage());
}
}
if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) {
@ -441,9 +439,8 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
public Map<String, Object> getListRuangan(Integer loginUserId) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> listRuangan = loginUserDao.getListRuangan(loginUserId);
if (CommonUtil.isNotNullOrEmpty(listRuangan)) {
if (CommonUtil.isNotNullOrEmpty(listRuangan))
result.put("listRuangan", listRuangan);
}
return result;
}
@ -451,62 +448,22 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
public Map<String, Object> getListModulAplikasi(Integer pegawaiId) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> listModulAplikasi = loginUserDao.getListModulAplikasi(pegawaiId);
if (CommonUtil.isNotNullOrEmpty(listModulAplikasi)) {
if (CommonUtil.isNotNullOrEmpty(listModulAplikasi))
result.put("listModulAplikasi", listModulAplikasi);
}
return result;
}
@Override
public List<Map<String, Object>> getListObjectModulAplikasi(Integer modulAplikasiId) {
List<Map<String, Object>> result = new ArrayList<>();
// for(Map<String, Object> objectModulHead :
// loginUserDao.getObjectModulHeadByModul(modulAplikasiId)){
// Map<String, Object> parent = new HashMap<>();
//
// if(CommonUtil.isNotNullOrEmpty(objectModulHead)){
// parent.put("name", objectModulHead.get("objekModulAplikasi"));
// parent.put("noUrut", objectModulHead.get("objekModulNoUrut"));
//
// List<Map<String, Object>> listObjectModul =
// loginUserDao.getModulByModulHead((Integer)objectModulHead.get("id"));
// if(CommonUtil.isNullOrEmpty(listObjectModul)){
// parent.put("link", objectModulHead.get("alamatUrlForm"));
// }
//
// List<Map<String, Object>> listChildren = new ArrayList<>();
// for(Map<String, Object> objectModul: listObjectModul){
// Map<String, Object> children = new HashMap<>();
//
// if(CommonUtil.isNotNullOrEmpty(objectModul)){
// children.put("name", objectModul.get("objekModulAplikasi"));
// children.put("link", objectModul.get("alamatUrlForm"));
// children.put("noUrut", objectModul.get("objekModulNoUrut"));
// }
// if(CommonUtil.isNotNullOrEmpty(children)){
// listChildren.add(children);
// }
// }
// if(CommonUtil.isNotNullOrEmpty(listChildren)){
// parent.put("children", listChildren);
// }
// }
// if(CommonUtil.isNotNullOrEmpty(parent)){
// result.add(parent);
// }
// }
return result;
return new ArrayList<>();
}
@Override
public Map<String, Object> saveUpdateLoginUser(LoginUserVO vo) {
Map<String, Object> result = new HashMap<>();
if (CommonUtil.isNotNullOrEmpty(vo)) {
LoginUser loginUser = new LoginUser();
if (CommonUtil.isNotNullOrEmpty(vo.getId())) {
loginUser = setLoginUser(vo);
LoginUser loginUser = setLoginUser(vo);
if (CommonUtil.isNotNullOrEmpty(loginUser)) {
LoginUser loginUserResult = loginUserDao.save(loginUser);
result.put("namaUser", loginUserResult.getNamaUser());
@ -518,7 +475,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
if (CommonUtil.isNotNullOrEmpty(users)) {
result.put("statusError", "Nama user sudah ada, silahkan input nama user lainya");
} else {
loginUser = setLoginUser(vo);
LoginUser loginUser = setLoginUser(vo);
if (CommonUtil.isNotNullOrEmpty(loginUser)) {
LoginUser loginUserResult = loginUserDao.save(loginUser);
result.put("namaUser", loginUserResult.getNamaUser());
@ -557,7 +514,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser
try {
loginUser.setKataSandi(new PasswordUtil().encryptPassword(vo.getKataSandi()));
} catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
e.printStackTrace();
throw new ServiceVOException(e.getMessage());
}
}
if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) {