This commit is contained in:
string 2025-06-12 09:50:26 +05:30
parent 0fe2b06529
commit 05a5b0b3a0
13 changed files with 5 additions and 498 deletions

View File

@ -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 {

View File

@ -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<Basicp> getall(@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "size", required = false) Integer size) {
Pageable paging = PageRequest.of(page, size);
Page<Basicp> get = Service.getAllWithPagination(paging);
return get;
}
@GetMapping("/Basicp")
public List<Basicp> getdetails() {
List<Basicp> get = Service.getdetails();
return get;
}
// get all without authentication
@GetMapping("/token/Basicp")
public List<Basicp> getallwioutsec() {
List<Basicp> 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);
}
}

View File

@ -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<Test2> getall(@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "size", required = false) Integer size) {
Pageable paging = PageRequest.of(page, size);
Page<Test2> get = Service.getAllWithPagination(paging);
return get;
}
@GetMapping("/Test2")
public List<Test2> getdetails() {
List<Test2> get = Service.getdetails();
return get;
}
// get all without authentication
@GetMapping("/token/Test2")
public List<Test2> getallwioutsec() {
List<Test2> 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);
}
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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<Basicp, Integer> {
@Query(value = "select * from basicp where created_by=?1", nativeQuery = true)
List<Basicp> findAll(Long creayedBy);
@Query(value = "select * from basicp where created_by=?1", nativeQuery = true)
Page<Basicp> findAll(Pageable page, Long creayedBy);
}

View File

@ -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<Test2, Integer> {
@Query(value = "select * from test2 where created_by=?1", nativeQuery = true)
List<Test2> findAll(Long creayedBy);
@Query(value = "select * from test2 where created_by=?1", nativeQuery = true)
Page<Test2> findAll(Pageable page, Long creayedBy);
}

View File

@ -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<Basicp> getAllWithPagination(Pageable page) {
return Repository.findAll(page, getUser().getUserId());
}
public List<Basicp> getdetails() {
List<Realm> realm = realmService.findByUserId(getUser().getUserId());
List<Basicp> 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;
}}

View File

@ -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<Test2> getAllWithPagination(Pageable page) {
return Repository.findAll(page, getUser().getUserId());
}
public List<Test2> getdetails() {
List<Realm> realm = realmService.findByUserId(getUser().getUserId());
List<Test2> 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;
}}

View File

@ -40,9 +40,8 @@ public class GeneratetokenController {
}
@DeleteMapping("/delete")
@DeleteMapping("/delete/{id}")
public void delete(@PathVariable Integer id) {
generatetokenService.delete(id);
}

View File

@ -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;

View File

@ -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);
}

View File

@ -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("_", " ");