diff --git a/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 11edc5f..f9801fb 100644 --- a/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -76,7 +76,7 @@ public class BuilderService { // add Custom sec menu detail - public ResponseEntity addCustomMenu(String tableName, String MenuType) { + public ResponseEntity addCustomMenu(String tableName, String menuActionLink, String MenuType) { // default menu that is Transcation Long menuid = 1577l; @@ -92,7 +92,7 @@ public class BuilderService { if (entity_t == null) { System.out.println("now inserting menu"); - menuDet = secmenuDetailService.customsecmenuadd(tableName, menuid); + menuDet = secmenuDetailService.customsecmenuadd(tableName, menuActionLink, menuid); savebuilderentity(tableName, "Menu"); } else { diff --git a/backend/src/main/java/com/realnet/angulardata/Controllers/BasicpController.java b/backend/src/main/java/com/realnet/angulardata/Controllers/BasicpController.java deleted file mode 100644 index d9a2329..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Controllers/BasicpController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.realnet.angulardata.Controllers; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.springframework.web.bind.annotation.CrossOrigin; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.realnet.config.EmailService; -import com.realnet.users.entity1.AppUser; -import com.realnet.users.service1.AppUserServiceImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.data.domain.*; -import com.realnet.fnd.response.EntityResponse; -import org.springframework.http.*; -import org.springframework.beans.factory.annotation.*; -import com.realnet.angulardata.Entity.Basicp; -import com.realnet.angulardata.Services.BasicpService ; - - - - -@RequestMapping(value = "/Basicp") - @CrossOrigin("*") -@RestController -public class BasicpController { - @Autowired - private BasicpService Service; - -@Value("${projectPath}") - private String projectPath; - - - - - - @PostMapping("/Basicp") - public Basicp Savedata(@RequestBody Basicp data) { - Basicp save = Service.Savedata(data) ; - - - - System.out.println("data saved..." + save); - - return save; - } -@PutMapping("/Basicp/{id}") - public Basicp update(@RequestBody Basicp data,@PathVariable Integer id ) { - Basicp update = Service.update(data,id); - System.out.println("data update..." + update); - return update; - } -// get all with pagination - @GetMapping("/Basicp/getall/page") - public Page getall(@RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "size", required = false) Integer size) { - Pageable paging = PageRequest.of(page, size); - Page get = Service.getAllWithPagination(paging); - - return get; - - } - @GetMapping("/Basicp") - public List getdetails() { - List get = Service.getdetails(); - return get; -} -// get all without authentication - - @GetMapping("/token/Basicp") - public List getallwioutsec() { - List get = Service.getdetails(); - return get; -} -@GetMapping("/Basicp/{id}") - public Basicp getdetailsbyId(@PathVariable Integer id ) { - Basicp get = Service.getdetailsbyId(id); - return get; - } -@DeleteMapping("/Basicp/{id}") - public ResponseEntity delete_by_id(@PathVariable Integer id ) { - Service.delete_by_id(id); - return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK); - - } - - - - - -} \ No newline at end of file diff --git a/backend/src/main/java/com/realnet/angulardata/Controllers/Test2Controller.java b/backend/src/main/java/com/realnet/angulardata/Controllers/Test2Controller.java deleted file mode 100644 index 208436a..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Controllers/Test2Controller.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.realnet.angulardata.Controllers; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.springframework.web.bind.annotation.CrossOrigin; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.realnet.config.EmailService; -import com.realnet.users.entity1.AppUser; -import com.realnet.users.service1.AppUserServiceImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.data.domain.*; -import com.realnet.fnd.response.EntityResponse; -import org.springframework.http.*; -import org.springframework.beans.factory.annotation.*; -import com.realnet.angulardata.Entity.Test2; -import com.realnet.angulardata.Services.Test2Service ; - - - - - - -@RequestMapping(value = "/Test2") - @CrossOrigin("*") -@RestController -public class Test2Controller { - @Autowired - private Test2Service Service; - -@Value("${projectPath}") - private String projectPath; - - - - - - - - @PostMapping("/Test2") - public Test2 Savedata(@RequestBody Test2 data) { - Test2 save = Service.Savedata(data) ; - - - - - - System.out.println("data saved..." + save); - - return save; - } -@PutMapping("/Test2/{id}") - public Test2 update(@RequestBody Test2 data,@PathVariable Integer id ) { - Test2 update = Service.update(data,id); - System.out.println("data update..." + update); - return update; - } -// get all with pagination - @GetMapping("/Test2/getall/page") - public Page getall(@RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "size", required = false) Integer size) { - Pageable paging = PageRequest.of(page, size); - Page get = Service.getAllWithPagination(paging); - - return get; - - } - @GetMapping("/Test2") - public List getdetails() { - List get = Service.getdetails(); - return get; -} -// get all without authentication - - @GetMapping("/token/Test2") - public List getallwioutsec() { - List get = Service.getdetails(); - return get; -} -@GetMapping("/Test2/{id}") - public Test2 getdetailsbyId(@PathVariable Integer id ) { - Test2 get = Service.getdetailsbyId(id); - return get; - } -@DeleteMapping("/Test2/{id}") - public ResponseEntity delete_by_id(@PathVariable Integer id ) { - Service.delete_by_id(id); - return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK); - - } - - - - - - - -} \ No newline at end of file diff --git a/backend/src/main/java/com/realnet/angulardata/Entity/Basicp.java b/backend/src/main/java/com/realnet/angulardata/Entity/Basicp.java deleted file mode 100644 index e7280bc..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Entity/Basicp.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.realnet.angulardata.Entity; - import lombok.*; -import com.realnet.WhoColumn.Entity.Extension; - import javax.persistence.*; - import java.time.LocalDateTime; - import java.util.*; - - - - - @Entity - @Data - public class Basicp extends Extension { - /** - * - */ - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - -private String name; - -@Column(length = 2000) -private String description; - - -} diff --git a/backend/src/main/java/com/realnet/angulardata/Entity/Test2.java b/backend/src/main/java/com/realnet/angulardata/Entity/Test2.java deleted file mode 100644 index 0210fe8..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Entity/Test2.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.realnet.angulardata.Entity; - import lombok.*; -import com.realnet.WhoColumn.Entity.Extension; - import javax.persistence.*; - import java.time.LocalDateTime; - import java.util.*; - - - - - - - @Entity - @Data - public class Test2 extends Extension { - /** - * - */ - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - -private String name; - -@Column(length = 2000) -private String description; - -private boolean active; - - -} diff --git a/backend/src/main/java/com/realnet/angulardata/Repository/BasicpRepository.java b/backend/src/main/java/com/realnet/angulardata/Repository/BasicpRepository.java deleted file mode 100644 index 502bad7..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Repository/BasicpRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.realnet.angulardata.Repository; - - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import org.springframework.stereotype.Repository; -import java.util.*; - - - - - - - -import com.realnet.angulardata.Entity.Basicp; - -@Repository -public interface BasicpRepository extends JpaRepository { - -@Query(value = "select * from basicp where created_by=?1", nativeQuery = true) - List findAll(Long creayedBy); - -@Query(value = "select * from basicp where created_by=?1", nativeQuery = true) - Page findAll(Pageable page, Long creayedBy); -} \ No newline at end of file diff --git a/backend/src/main/java/com/realnet/angulardata/Repository/Test2Repository.java b/backend/src/main/java/com/realnet/angulardata/Repository/Test2Repository.java deleted file mode 100644 index cf5dd7b..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Repository/Test2Repository.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.realnet.angulardata.Repository; - - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import org.springframework.stereotype.Repository; -import java.util.*; - - - - - - - - - -import com.realnet.angulardata.Entity.Test2; - -@Repository -public interface Test2Repository extends JpaRepository { - -@Query(value = "select * from test2 where created_by=?1", nativeQuery = true) - List findAll(Long creayedBy); - -@Query(value = "select * from test2 where created_by=?1", nativeQuery = true) - Page findAll(Pageable page, Long creayedBy); -} \ No newline at end of file diff --git a/backend/src/main/java/com/realnet/angulardata/Services/BasicpService.java b/backend/src/main/java/com/realnet/angulardata/Services/BasicpService.java deleted file mode 100644 index 2ce8327..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Services/BasicpService.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.realnet.angulardata.Services; -import com.realnet.angulardata.Repository.BasicpRepository; -import com.realnet.angulardata.Entity.Basicp -;import java.util.*; - -import org.springframework.beans.factory.annotation.Autowired; -import com.realnet.SequenceGenerator.Service.SequenceService; -import org.springframework.data.domain.Page; -import com.realnet.realm.Entity.Realm; -import com.realnet.realm.Services.RealmService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.*; -import com.realnet.users.service1.AppUserServiceImpl; -import com.realnet.users.entity1.AppUser; - - - - - import org.springframework.stereotype.Service; - -@Service - public class BasicpService { -@Autowired -private BasicpRepository Repository; - @Autowired - private AppUserServiceImpl userService; -@Autowired - private RealmService realmService; - - - -public Basicp Savedata(Basicp data) { - - - - - data.setUpdatedBy(getUser().getUserId()); - data.setCreatedBy(getUser().getUserId()); - data.setAccountId(getUser().getAccount().getAccount_id()); -Basicp save = Repository.save(data); - return save; - } - - -// get all with pagination - public Page getAllWithPagination(Pageable page) { - return Repository.findAll(page, getUser().getUserId()); - } -public List getdetails() { - List realm = realmService.findByUserId(getUser().getUserId()); -List all = Repository.findAll(getUser().getUserId()); - - return all ; } - - -public Basicp getdetailsbyId(Integer id) { - return Repository.findById(id).get(); - } - - - public void delete_by_id(Integer id) { - Repository.deleteById(id); -} - - -public Basicp update(Basicp data,Integer id) { - Basicp old = Repository.findById(id).get(); -old.setName(data.getName()); - -old.setDescription(data.getDescription()); - -final Basicp test = Repository.save(old); - data.setUpdatedBy(getUser().getUserId()); - return test;} - - - - - public AppUser getUser() { - AppUser user = userService.getLoggedInUser(); - return user; - - }} diff --git a/backend/src/main/java/com/realnet/angulardata/Services/Test2Service.java b/backend/src/main/java/com/realnet/angulardata/Services/Test2Service.java deleted file mode 100644 index 747ec11..0000000 --- a/backend/src/main/java/com/realnet/angulardata/Services/Test2Service.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.realnet.angulardata.Services; -import com.realnet.angulardata.Repository.Test2Repository; -import com.realnet.angulardata.Entity.Test2 -;import java.util.*; - -import org.springframework.beans.factory.annotation.Autowired; -import com.realnet.SequenceGenerator.Service.SequenceService; -import org.springframework.data.domain.Page; -import com.realnet.realm.Entity.Realm; -import com.realnet.realm.Services.RealmService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.*; -import com.realnet.users.service1.AppUserServiceImpl; -import com.realnet.users.entity1.AppUser; - - - - - - - import org.springframework.stereotype.Service; - -@Service - public class Test2Service { -@Autowired -private Test2Repository Repository; - @Autowired - private AppUserServiceImpl userService; -@Autowired - private RealmService realmService; - - - - - -public Test2 Savedata(Test2 data) { - - - - - - - data.setUpdatedBy(getUser().getUserId()); - data.setCreatedBy(getUser().getUserId()); - data.setAccountId(getUser().getAccount().getAccount_id()); -Test2 save = Repository.save(data); - return save; - } - - -// get all with pagination - public Page getAllWithPagination(Pageable page) { - return Repository.findAll(page, getUser().getUserId()); - } -public List getdetails() { - List realm = realmService.findByUserId(getUser().getUserId()); -List all = Repository.findAll(getUser().getUserId()); - - return all ; } - - -public Test2 getdetailsbyId(Integer id) { - return Repository.findById(id).get(); - } - - - public void delete_by_id(Integer id) { - Repository.deleteById(id); -} - - -public Test2 update(Test2 data,Integer id) { - Test2 old = Repository.findById(id).get(); -old.setName(data.getName()); - -old.setDescription(data.getDescription()); - -old.setActive (data.isActive()); - -final Test2 test = Repository.save(old); - data.setUpdatedBy(getUser().getUserId()); - return test;} - - - - - - - public AppUser getUser() { - AppUser user = userService.getLoggedInUser(); - return user; - - }} diff --git a/backend/src/main/java/com/realnet/api_registery/Controllers/GeneratetokenController.java b/backend/src/main/java/com/realnet/api_registery/Controllers/GeneratetokenController.java index 6686419..698f934 100644 --- a/backend/src/main/java/com/realnet/api_registery/Controllers/GeneratetokenController.java +++ b/backend/src/main/java/com/realnet/api_registery/Controllers/GeneratetokenController.java @@ -40,9 +40,8 @@ public class GeneratetokenController { } - @DeleteMapping("/delete") + @DeleteMapping("/delete/{id}") public void delete(@PathVariable Integer id) { - generatetokenService.delete(id); } diff --git a/backend/src/main/java/com/realnet/api_registery/Services/GeneratetokenService.java b/backend/src/main/java/com/realnet/api_registery/Services/GeneratetokenService.java index 5401fff..76e3bb3 100644 --- a/backend/src/main/java/com/realnet/api_registery/Services/GeneratetokenService.java +++ b/backend/src/main/java/com/realnet/api_registery/Services/GeneratetokenService.java @@ -7,7 +7,6 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; @@ -27,9 +26,6 @@ public class GeneratetokenService { @Autowired private AppUserServiceImpl userServiceImpl; - @Autowired - private BCryptPasswordEncoder bcryptEncoder; - @Autowired private Token_registery_Repository token_registery_Repository; @@ -49,8 +45,6 @@ public class GeneratetokenService { String url = "http://localhost:9292"; String repo = "/token/session"; - // ADD DATA IN GITEA - System.out.println(builder.toString()); String job_url = url + repo; diff --git a/backend/src/main/java/com/realnet/fnd/controller1/TokenFreeController.java b/backend/src/main/java/com/realnet/fnd/controller1/TokenFreeController.java index 875fd89..e3a41d8 100644 --- a/backend/src/main/java/com/realnet/fnd/controller1/TokenFreeController.java +++ b/backend/src/main/java/com/realnet/fnd/controller1/TokenFreeController.java @@ -28,7 +28,7 @@ public class TokenFreeController { @PostMapping("/Sec_menuDet/custom") public ResponseEntity addCustomMenu(@RequestParam String tableName, @RequestParam Long menuid) { - MenuDet menuDet = secmenuDetailService.customsecmenuadd(tableName, menuid); + MenuDet menuDet = secmenuDetailService.customsecmenuadd(tableName, tableName, menuid); return new ResponseEntity<>(menuDet, HttpStatus.CREATED); } diff --git a/backend/src/main/java/com/realnet/fnd/service1/SecmenuDetailService.java b/backend/src/main/java/com/realnet/fnd/service1/SecmenuDetailService.java index 3a60a9c..9a2d2b2 100644 --- a/backend/src/main/java/com/realnet/fnd/service1/SecmenuDetailService.java +++ b/backend/src/main/java/com/realnet/fnd/service1/SecmenuDetailService.java @@ -26,7 +26,7 @@ public class SecmenuDetailService { @Autowired private GrpMenuAccessRepository grpMenuAccessRepository; - public MenuDet customsecmenuadd(String tablename, Long menuId) { + public MenuDet customsecmenuadd(String tablename, String menuActionLink, Long menuId) { MenuDet menuDet = new MenuDet(); String origTableName = tablename.replaceAll("_", " ");