Skip to content

PS
PS
提交 58029906 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 9d812313
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1564 行增加 和 3025 行删除
.gitignore
浏览文件 @ 58029906
*target *target
.settings .settings
*node_modules
*bin *bin
*.project *.project
*.classpath *.classpath
......
config.xml
浏览文件 @ 58029906
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
mvn install mvn install
cd .. cd ..
mvn install mvn install
cd ps-app/ps-app-web cd ps-boot
mvn clean package -Pprod mvn clean package
echo 'echo "$para1"' > apppasswd.sh echo 'echo "$para1"' > apppasswd.sh
chmod -R 777 * chmod -R 777 *
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6" setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6 setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6'| tr -s ' '|cut -d' ' -f2,8,9 | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs --no-run-if-empty kill -9" setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5'| tr -s ' '|cut -d' ' -f2,8,9 | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs --no-run-if-empty kill -9"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps-app-web.jar >>/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &" setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps.jar >>/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
pom.xml
浏览文件 @ 58029906
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
<modules> <modules>
<!-- dependencies --> <!-- dependencies -->
<module>ps-dependencies</module> <module>ps-dependencies</module>
<!-- ext libs -->
<module>ps-ext-libs</module>
<!-- utils --> <!-- utils -->
<module>ps-util</module> <module>ps-util</module>
<!-- comenpents --> <!-- comenpents -->
......
ps-app-usr/pom.xml
浏览文件 @ 58029906
...@@ -19,11 +19,7 @@ ...@@ -19,11 +19,7 @@
</modules> </modules>
<dependencies> <dependencies>
<dependency>
<groupId>com.ibiz</groupId>
<artifactId>ps-ext-libs</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
ps-app/pom.xml
浏览文件 @ 58029906
...@@ -46,12 +46,6 @@ ...@@ -46,12 +46,6 @@
<artifactId>ps-util</artifactId> <artifactId>ps-util</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.ibiz</groupId>
<artifactId>ps-ext-libs</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
ps-app/ps-app-web/src/main/java/com/ibiz/web/WebApplication.java
浏览文件 @ 58029906
...@@ -2,10 +2,6 @@ package com.ibiz.web; ...@@ -2,10 +2,6 @@ package com.ibiz.web;
import java.util.List; import java.util.List;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
...@@ -23,10 +19,11 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert ...@@ -23,10 +19,11 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibiz.util.web.SearchContextHandlerMethodArgumentResolver; import com.ibiz.util.web.SearchContextHandlerMethodArgumentResolver;
import com.ibiz.util.serialize.DomainSerializerProvider; import com.ibiz.util.serialize.DomainSerializerProvider;
import lombok.Data;
@Slf4j
@SpringBootApplication(exclude = { @SpringBootApplication(exclude = {
}) })
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/app/WebAppController.java
浏览文件 @ 58029906
...@@ -4,9 +4,6 @@ import java.util.ArrayList; ...@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
...@@ -15,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.ibiz.util.helper.SpringContextHolder; import com.ibiz.util.helper.SpringContextHolder;
import com.ibiz.util.security.userdetail.LoginUser; import com.ibiz.util.security.userdetail.LoginUser;
import com.ibiz.util.web.SessionConstants; import com.ibiz.util.web.SessionConstants;
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/module/controller/PSController.java
浏览文件 @ 58029906
...@@ -3,15 +3,13 @@ package com.ibiz.web.module.controller; ...@@ -3,15 +3,13 @@ package com.ibiz.web.module.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest; ...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest;
import com.ibiz.web.module.service.PSService; import com.ibiz.web.module.service.PSService;
import com.ibiz.web.module.domain.PS; import com.ibiz.web.module.domain.PS;
import com.ibiz.web.module.filter.*; import com.ibiz.web.module.filter.*;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
public class PSController { public class PSController {
...@@ -32,8 +26,6 @@ public class PSController { ...@@ -32,8 +26,6 @@ public class PSController {
PSService psservice; PSService psservice;
//@GlobalTransactional
//@GlobalTransactional
@RequestMapping(method = RequestMethod.DELETE, value = "/ps/{ps_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ps/{ps_id}")
@PreAuthorize("@ps_pms.check(#ps_id,'DELETE')") @PreAuthorize("@ps_pms.check(#ps_id,'DELETE')")
public ResponseEntity<Boolean> remove(@PathVariable("ps_id") String ps_id) { public ResponseEntity<Boolean> remove(@PathVariable("ps_id") String ps_id) {
...@@ -41,7 +33,6 @@ public class PSController { ...@@ -41,7 +33,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/ps") @RequestMapping(method = RequestMethod.POST, value = "/ps")
@PreAuthorize("@ps_pms.check('CREATE')") @PreAuthorize("@ps_pms.check('CREATE')")
public ResponseEntity<PS> create(@RequestBody PS ps) { public ResponseEntity<PS> create(@RequestBody PS ps) {
...@@ -49,7 +40,6 @@ public class PSController { ...@@ -49,7 +40,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps2); return ResponseEntity.status(HttpStatus.OK).body(ps2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/ps/{ps_id}") @RequestMapping(method = RequestMethod.GET, value = "/ps/{ps_id}")
@PreAuthorize("@ps_pms.check(#ps_id,'READ')") @PreAuthorize("@ps_pms.check(#ps_id,'READ')")
public ResponseEntity<PS> get(@PathVariable("ps_id") String ps_id) { public ResponseEntity<PS> get(@PathVariable("ps_id") String ps_id) {
...@@ -57,7 +47,6 @@ public class PSController { ...@@ -57,7 +47,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps); return ResponseEntity.status(HttpStatus.OK).body(ps);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/xd") @RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/xd")
@PreAuthorize("@ps_pms.check(#ps_id,'')") @PreAuthorize("@ps_pms.check(#ps_id,'')")
public ResponseEntity<PS> xD(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) { public ResponseEntity<PS> xD(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) {
...@@ -65,7 +54,6 @@ public class PSController { ...@@ -65,7 +54,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps2); return ResponseEntity.status(HttpStatus.OK).body(ps2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/ps/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ps/getdraft")
@PreAuthorize("@ps_pms.check('CREATE')") @PreAuthorize("@ps_pms.check('CREATE')")
public ResponseEntity<PS> getDraft() { public ResponseEntity<PS> getDraft() {
...@@ -73,7 +61,6 @@ public class PSController { ...@@ -73,7 +61,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(new PS()); return ResponseEntity.status(HttpStatus.OK).body(new PS());
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/save") @RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/save")
@PreAuthorize("@ps_pms.check(#ps_id,'')") @PreAuthorize("@ps_pms.check(#ps_id,'')")
public ResponseEntity<PS> save(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) { public ResponseEntity<PS> save(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) {
...@@ -81,7 +68,6 @@ public class PSController { ...@@ -81,7 +68,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps2); return ResponseEntity.status(HttpStatus.OK).body(ps2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.PUT, value = "/ps/{ps_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ps/{ps_id}")
@PreAuthorize("@ps_pms.check(#ps_id,'UPDATE')") @PreAuthorize("@ps_pms.check(#ps_id,'UPDATE')")
public ResponseEntity<PS> update(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) { public ResponseEntity<PS> update(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) {
...@@ -96,7 +82,6 @@ public class PSController { ...@@ -96,7 +82,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps2); return ResponseEntity.status(HttpStatus.OK).body(ps2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/createandstartim") @RequestMapping(method = RequestMethod.POST, value = "/ps/{ps_id}/createandstartim")
@PreAuthorize("@ps_pms.check(#ps_id,'CREATE')") @PreAuthorize("@ps_pms.check(#ps_id,'CREATE')")
public ResponseEntity<PS> createAndStartIM(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) { public ResponseEntity<PS> createAndStartIM(@PathVariable("ps_id") String ps_id, @RequestBody PS ps) {
...@@ -104,7 +89,6 @@ public class PSController { ...@@ -104,7 +89,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(ps2); return ResponseEntity.status(HttpStatus.OK).body(ps2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/ps/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ps/checkkey")
@PreAuthorize("@ps_pms.check('')") @PreAuthorize("@ps_pms.check('')")
public ResponseEntity<Boolean> checkKey(@RequestBody PS ps) { public ResponseEntity<Boolean> checkKey(@RequestBody PS ps) {
...@@ -112,7 +96,6 @@ public class PSController { ...@@ -112,7 +96,6 @@ public class PSController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/ps/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ps/fetchdefault")
@PreAuthorize("@ps_pms.check('READ')") @PreAuthorize("@ps_pms.check('READ')")
public ResponseEntity<List<PS>> fetchDefault(PSSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<PS>> fetchDefault(PSSearchContext searchContext,Pageable pageable) {
...@@ -125,12 +108,5 @@ public class PSController { ...@@ -125,12 +108,5 @@ public class PSController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
} }
ps-app/ps-app-web/src/main/java/com/ibiz/web/module/filter/PSSearchContext.java
浏览文件 @ 58029906
...@@ -7,10 +7,8 @@ import java.util.List; ...@@ -7,10 +7,8 @@ import java.util.List;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.log.IBIZLog;
@Data @Data
@IBIZLog
public class PSSearchContext extends SearchContext implements Serializable { public class PSSearchContext extends SearchContext implements Serializable {
public String n_psname_like;//[采购单名称] public String n_psname_like;//[采购单名称]
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/module/service/PSService.java
浏览文件 @ 58029906
package com.ibiz.web.module.service; package com.ibiz.web.module.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
...@@ -12,14 +13,13 @@ import feign.Feign; ...@@ -12,14 +13,13 @@ import feign.Feign;
import feign.codec.Decoder; import feign.codec.Decoder;
import feign.codec.Encoder; import feign.codec.Encoder;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Service;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.module.domain.PS; import com.ibiz.web.module.domain.PS;
...@@ -27,10 +27,7 @@ import com.ibiz.web.module.filter.*; ...@@ -27,10 +27,7 @@ import com.ibiz.web.module.filter.*;
import com.ibiz.web.module.feign.PSFeignClient; import com.ibiz.web.module.feign.PSFeignClient;
import com.ibiz.web.WebApplication.WebClientProperties; import com.ibiz.web.WebApplication.WebClientProperties;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Service @Service
public class PSService { public class PSService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/controller/OrgController.java
浏览文件 @ 58029906
...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller; ...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest; ...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgService; import com.ibiz.web.r7rt_org.service.OrgService;
import com.ibiz.web.r7rt_org.domain.Org; import com.ibiz.web.r7rt_org.domain.Org;
import com.ibiz.web.r7rt_org.filter.*; import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
public class OrgController { public class OrgController {
...@@ -32,7 +26,6 @@ public class OrgController { ...@@ -32,7 +26,6 @@ public class OrgController {
OrgService orgservice; OrgService orgservice;
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgs/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/orgs/getdraft")
@PreAuthorize("@org_pms.check('CREATE')") @PreAuthorize("@org_pms.check('CREATE')")
public ResponseEntity<Org> getDraft() { public ResponseEntity<Org> getDraft() {
...@@ -40,7 +33,6 @@ public class OrgController { ...@@ -40,7 +33,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(new Org()); return ResponseEntity.status(HttpStatus.OK).body(new Org());
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}/getorgprent") @RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}/getorgprent")
@PreAuthorize("@org_pms.check(#org_id,'READ')") @PreAuthorize("@org_pms.check(#org_id,'READ')")
public ResponseEntity<Org> getOrgPrent(@PathVariable("org_id") String org_id, @RequestBody Org org) { public ResponseEntity<Org> getOrgPrent(@PathVariable("org_id") String org_id, @RequestBody Org org) {
...@@ -48,7 +40,6 @@ public class OrgController { ...@@ -48,7 +40,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.DELETE, value = "/orgs/{org_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/orgs/{org_id}")
@PreAuthorize("@org_pms.check(#org_id,'DELETE')") @PreAuthorize("@org_pms.check(#org_id,'DELETE')")
public ResponseEntity<Boolean> remove(@PathVariable("org_id") String org_id) { public ResponseEntity<Boolean> remove(@PathVariable("org_id") String org_id) {
...@@ -56,7 +47,6 @@ public class OrgController { ...@@ -56,7 +47,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.PUT, value = "/orgs/{org_id}") @RequestMapping(method = RequestMethod.PUT, value = "/orgs/{org_id}")
@PreAuthorize("@org_pms.check(#org_id,'UPDATE')") @PreAuthorize("@org_pms.check(#org_id,'UPDATE')")
public ResponseEntity<Org> update(@PathVariable("org_id") String org_id, @RequestBody Org org) { public ResponseEntity<Org> update(@PathVariable("org_id") String org_id, @RequestBody Org org) {
...@@ -71,7 +61,6 @@ public class OrgController { ...@@ -71,7 +61,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}") @RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}")
@PreAuthorize("@org_pms.check(#org_id,'READ')") @PreAuthorize("@org_pms.check(#org_id,'READ')")
public ResponseEntity<Org> get(@PathVariable("org_id") String org_id) { public ResponseEntity<Org> get(@PathVariable("org_id") String org_id) {
...@@ -79,7 +68,6 @@ public class OrgController { ...@@ -79,7 +68,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org); return ResponseEntity.status(HttpStatus.OK).body(org);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgs") @RequestMapping(method = RequestMethod.POST, value = "/orgs")
@PreAuthorize("@org_pms.check('CREATE')") @PreAuthorize("@org_pms.check('CREATE')")
public ResponseEntity<Org> create(@RequestBody Org org) { public ResponseEntity<Org> create(@RequestBody Org org) {
...@@ -87,7 +75,6 @@ public class OrgController { ...@@ -87,7 +75,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgs/{org_id}/save") @RequestMapping(method = RequestMethod.POST, value = "/orgs/{org_id}/save")
@PreAuthorize("@org_pms.check(#org_id,'')") @PreAuthorize("@org_pms.check(#org_id,'')")
public ResponseEntity<Org> save(@PathVariable("org_id") String org_id, @RequestBody Org org) { public ResponseEntity<Org> save(@PathVariable("org_id") String org_id, @RequestBody Org org) {
...@@ -95,7 +82,6 @@ public class OrgController { ...@@ -95,7 +82,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgs/{org_id}/synctousergroup") @RequestMapping(method = RequestMethod.POST, value = "/orgs/{org_id}/synctousergroup")
@PreAuthorize("@org_pms.check(#org_id,'')") @PreAuthorize("@org_pms.check(#org_id,'')")
public ResponseEntity<Org> syncToUserGroup(@PathVariable("org_id") String org_id, @RequestBody Org org) { public ResponseEntity<Org> syncToUserGroup(@PathVariable("org_id") String org_id, @RequestBody Org org) {
...@@ -103,7 +89,6 @@ public class OrgController { ...@@ -103,7 +89,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgs/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/orgs/checkkey")
@PreAuthorize("@org_pms.check('')") @PreAuthorize("@org_pms.check('')")
public ResponseEntity<Boolean> checkKey(@RequestBody Org org) { public ResponseEntity<Boolean> checkKey(@RequestBody Org org) {
...@@ -111,7 +96,6 @@ public class OrgController { ...@@ -111,7 +96,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}/getorgchild") @RequestMapping(method = RequestMethod.GET, value = "/orgs/{org_id}/getorgchild")
@PreAuthorize("@org_pms.check(#org_id,'READ')") @PreAuthorize("@org_pms.check(#org_id,'READ')")
public ResponseEntity<Org> getOrgChild(@PathVariable("org_id") String org_id, @RequestBody Org org) { public ResponseEntity<Org> getOrgChild(@PathVariable("org_id") String org_id, @RequestBody Org org) {
...@@ -119,7 +103,6 @@ public class OrgController { ...@@ -119,7 +103,6 @@ public class OrgController {
return ResponseEntity.status(HttpStatus.OK).body(org2); return ResponseEntity.status(HttpStatus.OK).body(org2);
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgs/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/orgs/fetchdefault")
@PreAuthorize("@org_pms.check('READ')") @PreAuthorize("@org_pms.check('READ')")
public ResponseEntity<List<Org>> fetchDefault(OrgSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<Org>> fetchDefault(OrgSearchContext searchContext,Pageable pageable) {
...@@ -132,12 +115,5 @@ public class OrgController { ...@@ -132,12 +115,5 @@ public class OrgController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
} }
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/controller/OrgDeptController.java
浏览文件 @ 58029906
...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller; ...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest; ...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgDeptService; import com.ibiz.web.r7rt_org.service.OrgDeptService;
import com.ibiz.web.r7rt_org.domain.OrgDept; import com.ibiz.web.r7rt_org.domain.OrgDept;
import com.ibiz.web.r7rt_org.filter.*; import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
public class OrgDeptController { public class OrgDeptController {
...@@ -32,7 +26,6 @@ public class OrgDeptController { ...@@ -32,7 +26,6 @@ public class OrgDeptController {
OrgDeptService orgdeptservice; OrgDeptService orgdeptservice;
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdepts/{orgdept_id}/save") @RequestMapping(method = RequestMethod.POST, value = "/orgdepts/{orgdept_id}/save")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'')")
public ResponseEntity<OrgDept> save(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> save(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) {
...@@ -40,7 +33,6 @@ public class OrgDeptController { ...@@ -40,7 +33,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdepts/{orgdept_id}/synctousergroup") @RequestMapping(method = RequestMethod.POST, value = "/orgdepts/{orgdept_id}/synctousergroup")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'')")
public ResponseEntity<OrgDept> syncToUserGroup(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> syncToUserGroup(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) {
...@@ -48,7 +40,6 @@ public class OrgDeptController { ...@@ -48,7 +40,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}/getorgdeptchild") @RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}/getorgdeptchild")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')")
public ResponseEntity<OrgDept> getOrgDeptChild(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> getOrgDeptChild(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) {
...@@ -56,7 +47,6 @@ public class OrgDeptController { ...@@ -56,7 +47,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.DELETE, value = "/orgdepts/{orgdept_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/orgdepts/{orgdept_id}")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'DELETE')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'DELETE')")
public ResponseEntity<Boolean> remove(@PathVariable("orgdept_id") String orgdept_id) { public ResponseEntity<Boolean> remove(@PathVariable("orgdept_id") String orgdept_id) {
...@@ -64,7 +54,6 @@ public class OrgDeptController { ...@@ -64,7 +54,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}") @RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')")
public ResponseEntity<OrgDept> get(@PathVariable("orgdept_id") String orgdept_id) { public ResponseEntity<OrgDept> get(@PathVariable("orgdept_id") String orgdept_id) {
...@@ -72,7 +61,6 @@ public class OrgDeptController { ...@@ -72,7 +61,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept); return ResponseEntity.status(HttpStatus.OK).body(orgdept);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.PUT, value = "/orgdepts/{orgdept_id}") @RequestMapping(method = RequestMethod.PUT, value = "/orgdepts/{orgdept_id}")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'UPDATE')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'UPDATE')")
public ResponseEntity<OrgDept> update(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> update(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) {
...@@ -87,7 +75,6 @@ public class OrgDeptController { ...@@ -87,7 +75,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdepts/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/orgdepts/getdraft")
@PreAuthorize("@orgdept_pms.check('CREATE')") @PreAuthorize("@orgdept_pms.check('CREATE')")
public ResponseEntity<OrgDept> getDraft() { public ResponseEntity<OrgDept> getDraft() {
...@@ -95,7 +82,6 @@ public class OrgDeptController { ...@@ -95,7 +82,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(new OrgDept()); return ResponseEntity.status(HttpStatus.OK).body(new OrgDept());
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdepts") @RequestMapping(method = RequestMethod.POST, value = "/orgdepts")
@PreAuthorize("@orgdept_pms.check('CREATE')") @PreAuthorize("@orgdept_pms.check('CREATE')")
public ResponseEntity<OrgDept> create(@RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> create(@RequestBody OrgDept orgdept) {
...@@ -103,7 +89,6 @@ public class OrgDeptController { ...@@ -103,7 +89,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdepts/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/orgdepts/checkkey")
@PreAuthorize("@orgdept_pms.check('')") @PreAuthorize("@orgdept_pms.check('')")
public ResponseEntity<Boolean> checkKey(@RequestBody OrgDept orgdept) { public ResponseEntity<Boolean> checkKey(@RequestBody OrgDept orgdept) {
...@@ -111,7 +96,6 @@ public class OrgDeptController { ...@@ -111,7 +96,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}/getorgdeptprent") @RequestMapping(method = RequestMethod.GET, value = "/orgdepts/{orgdept_id}/getorgdeptprent")
@PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')") @PreAuthorize("@orgdept_pms.check(#orgdept_id,'READ')")
public ResponseEntity<OrgDept> getOrgDeptPrent(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) { public ResponseEntity<OrgDept> getOrgDeptPrent(@PathVariable("orgdept_id") String orgdept_id, @RequestBody OrgDept orgdept) {
...@@ -119,7 +103,6 @@ public class OrgDeptController { ...@@ -119,7 +103,6 @@ public class OrgDeptController {
return ResponseEntity.status(HttpStatus.OK).body(orgdept2); return ResponseEntity.status(HttpStatus.OK).body(orgdept2);
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgdepts/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/orgdepts/fetchdefault")
@PreAuthorize("@orgdept_pms.check('READ')") @PreAuthorize("@orgdept_pms.check('READ')")
public ResponseEntity<List<OrgDept>> fetchDefault(OrgDeptSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<OrgDept>> fetchDefault(OrgDeptSearchContext searchContext,Pageable pageable) {
...@@ -132,7 +115,6 @@ public class OrgDeptController { ...@@ -132,7 +115,6 @@ public class OrgDeptController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgdepts/fetchcur_org") @RequestMapping(method= RequestMethod.GET , value="/orgdepts/fetchcur_org")
@PreAuthorize("@orgdept_pms.check('READ')") @PreAuthorize("@orgdept_pms.check('READ')")
public ResponseEntity<List<OrgDept>> fetchCUR_ORG(OrgDeptSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<OrgDept>> fetchCUR_ORG(OrgDeptSearchContext searchContext,Pageable pageable) {
...@@ -145,12 +127,5 @@ public class OrgDeptController { ...@@ -145,12 +127,5 @@ public class OrgDeptController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
} }
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/controller/OrgDeptUserController.java
浏览文件 @ 58029906
...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller; ...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest; ...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgDeptUserService; import com.ibiz.web.r7rt_org.service.OrgDeptUserService;
import com.ibiz.web.r7rt_org.domain.OrgDeptUser; import com.ibiz.web.r7rt_org.domain.OrgDeptUser;
import com.ibiz.web.r7rt_org.filter.*; import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
public class OrgDeptUserController { public class OrgDeptUserController {
...@@ -32,7 +26,6 @@ public class OrgDeptUserController { ...@@ -32,7 +26,6 @@ public class OrgDeptUserController {
OrgDeptUserService orgdeptuserservice; OrgDeptUserService orgdeptuserservice;
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdeptusers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/orgdeptusers/getdraft")
@PreAuthorize("@orgdeptuser_pms.check('CREATE')") @PreAuthorize("@orgdeptuser_pms.check('CREATE')")
public ResponseEntity<OrgDeptUser> getDraft() { public ResponseEntity<OrgDeptUser> getDraft() {
...@@ -40,7 +33,6 @@ public class OrgDeptUserController { ...@@ -40,7 +33,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(new OrgDeptUser()); return ResponseEntity.status(HttpStatus.OK).body(new OrgDeptUser());
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgdeptusers/{orgdeptuser_id}") @RequestMapping(method = RequestMethod.GET, value = "/orgdeptusers/{orgdeptuser_id}")
@PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'READ')") @PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'READ')")
public ResponseEntity<OrgDeptUser> get(@PathVariable("orgdeptuser_id") String orgdeptuser_id) { public ResponseEntity<OrgDeptUser> get(@PathVariable("orgdeptuser_id") String orgdeptuser_id) {
...@@ -48,7 +40,6 @@ public class OrgDeptUserController { ...@@ -48,7 +40,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser); return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers/{orgdeptuser_id}/save") @RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers/{orgdeptuser_id}/save")
@PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'')") @PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'')")
public ResponseEntity<OrgDeptUser> save(@PathVariable("orgdeptuser_id") String orgdeptuser_id, @RequestBody OrgDeptUser orgdeptuser) { public ResponseEntity<OrgDeptUser> save(@PathVariable("orgdeptuser_id") String orgdeptuser_id, @RequestBody OrgDeptUser orgdeptuser) {
...@@ -56,7 +47,6 @@ public class OrgDeptUserController { ...@@ -56,7 +47,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2); return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers") @RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers")
@PreAuthorize("@orgdeptuser_pms.check('CREATE')") @PreAuthorize("@orgdeptuser_pms.check('CREATE')")
public ResponseEntity<OrgDeptUser> create(@RequestBody OrgDeptUser orgdeptuser) { public ResponseEntity<OrgDeptUser> create(@RequestBody OrgDeptUser orgdeptuser) {
...@@ -64,7 +54,6 @@ public class OrgDeptUserController { ...@@ -64,7 +54,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2); return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.DELETE, value = "/orgdeptusers/{orgdeptuser_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/orgdeptusers/{orgdeptuser_id}")
@PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'DELETE')") @PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'DELETE')")
public ResponseEntity<Boolean> remove(@PathVariable("orgdeptuser_id") String orgdeptuser_id) { public ResponseEntity<Boolean> remove(@PathVariable("orgdeptuser_id") String orgdeptuser_id) {
...@@ -72,7 +61,6 @@ public class OrgDeptUserController { ...@@ -72,7 +61,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.PUT, value = "/orgdeptusers/{orgdeptuser_id}") @RequestMapping(method = RequestMethod.PUT, value = "/orgdeptusers/{orgdeptuser_id}")
@PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'UPDATE')") @PreAuthorize("@orgdeptuser_pms.check(#orgdeptuser_id,'UPDATE')")
public ResponseEntity<OrgDeptUser> update(@PathVariable("orgdeptuser_id") String orgdeptuser_id, @RequestBody OrgDeptUser orgdeptuser) { public ResponseEntity<OrgDeptUser> update(@PathVariable("orgdeptuser_id") String orgdeptuser_id, @RequestBody OrgDeptUser orgdeptuser) {
...@@ -87,7 +75,6 @@ public class OrgDeptUserController { ...@@ -87,7 +75,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2); return ResponseEntity.status(HttpStatus.OK).body(orgdeptuser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/orgdeptusers/checkkey")
@PreAuthorize("@orgdeptuser_pms.check('')") @PreAuthorize("@orgdeptuser_pms.check('')")
public ResponseEntity<Boolean> checkKey(@RequestBody OrgDeptUser orgdeptuser) { public ResponseEntity<Boolean> checkKey(@RequestBody OrgDeptUser orgdeptuser) {
...@@ -95,7 +82,6 @@ public class OrgDeptUserController { ...@@ -95,7 +82,6 @@ public class OrgDeptUserController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgdeptusers/fetchgetorgdeptuser") @RequestMapping(method= RequestMethod.GET , value="/orgdeptusers/fetchgetorgdeptuser")
@PreAuthorize("@orgdeptuser_pms.check('READ')") @PreAuthorize("@orgdeptuser_pms.check('READ')")
public ResponseEntity<List<OrgDeptUser>> fetchGetorgdeptuser(OrgDeptUserSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<OrgDeptUser>> fetchGetorgdeptuser(OrgDeptUserSearchContext searchContext,Pageable pageable) {
...@@ -108,7 +94,6 @@ public class OrgDeptUserController { ...@@ -108,7 +94,6 @@ public class OrgDeptUserController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgdeptusers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/orgdeptusers/fetchdefault")
@PreAuthorize("@orgdeptuser_pms.check('READ')") @PreAuthorize("@orgdeptuser_pms.check('READ')")
public ResponseEntity<List<OrgDeptUser>> fetchDefault(OrgDeptUserSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<OrgDeptUser>> fetchDefault(OrgDeptUserSearchContext searchContext,Pageable pageable) {
...@@ -121,12 +106,5 @@ public class OrgDeptUserController { ...@@ -121,12 +106,5 @@ public class OrgDeptUserController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
} }
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/controller/OrgUserController.java
浏览文件 @ 58029906
...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller; ...@@ -3,15 +3,13 @@ package com.ibiz.web.r7rt_org.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest; ...@@ -20,11 +18,7 @@ import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgUserService; import com.ibiz.web.r7rt_org.service.OrgUserService;
import com.ibiz.web.r7rt_org.domain.OrgUser; import com.ibiz.web.r7rt_org.domain.OrgUser;
import com.ibiz.web.r7rt_org.filter.*; import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
public class OrgUserController { public class OrgUserController {
...@@ -32,7 +26,6 @@ public class OrgUserController { ...@@ -32,7 +26,6 @@ public class OrgUserController {
OrgUserService orguserservice; OrgUserService orguserservice;
//@GlobalTransactional
@RequestMapping(method = RequestMethod.DELETE, value = "/orgusers/{orguser_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/orgusers/{orguser_id}")
@PreAuthorize("@orguser_pms.check(#orguser_id,'DELETE')") @PreAuthorize("@orguser_pms.check(#orguser_id,'DELETE')")
public ResponseEntity<Boolean> remove(@PathVariable("orguser_id") String orguser_id) { public ResponseEntity<Boolean> remove(@PathVariable("orguser_id") String orguser_id) {
...@@ -40,7 +33,6 @@ public class OrgUserController { ...@@ -40,7 +33,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgusers/{orguser_id}/save") @RequestMapping(method = RequestMethod.POST, value = "/orgusers/{orguser_id}/save")
@PreAuthorize("@orguser_pms.check(#orguser_id,'')") @PreAuthorize("@orguser_pms.check(#orguser_id,'')")
public ResponseEntity<OrgUser> save(@PathVariable("orguser_id") String orguser_id, @RequestBody OrgUser orguser) { public ResponseEntity<OrgUser> save(@PathVariable("orguser_id") String orguser_id, @RequestBody OrgUser orguser) {
...@@ -48,7 +40,6 @@ public class OrgUserController { ...@@ -48,7 +40,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(orguser2); return ResponseEntity.status(HttpStatus.OK).body(orguser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.PUT, value = "/orgusers/{orguser_id}") @RequestMapping(method = RequestMethod.PUT, value = "/orgusers/{orguser_id}")
@PreAuthorize("@orguser_pms.check(#orguser_id,'UPDATE')") @PreAuthorize("@orguser_pms.check(#orguser_id,'UPDATE')")
public ResponseEntity<OrgUser> update(@PathVariable("orguser_id") String orguser_id, @RequestBody OrgUser orguser) { public ResponseEntity<OrgUser> update(@PathVariable("orguser_id") String orguser_id, @RequestBody OrgUser orguser) {
...@@ -63,7 +54,6 @@ public class OrgUserController { ...@@ -63,7 +54,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(orguser2); return ResponseEntity.status(HttpStatus.OK).body(orguser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgusers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/orgusers/checkkey")
@PreAuthorize("@orguser_pms.check('')") @PreAuthorize("@orguser_pms.check('')")
public ResponseEntity<Boolean> checkKey(@RequestBody OrgUser orguser) { public ResponseEntity<Boolean> checkKey(@RequestBody OrgUser orguser) {
...@@ -71,7 +61,6 @@ public class OrgUserController { ...@@ -71,7 +61,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(b); return ResponseEntity.status(HttpStatus.OK).body(b);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgusers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/orgusers/getdraft")
@PreAuthorize("@orguser_pms.check('CREATE')") @PreAuthorize("@orguser_pms.check('CREATE')")
public ResponseEntity<OrgUser> getDraft() { public ResponseEntity<OrgUser> getDraft() {
...@@ -79,7 +68,6 @@ public class OrgUserController { ...@@ -79,7 +68,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(new OrgUser()); return ResponseEntity.status(HttpStatus.OK).body(new OrgUser());
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.POST, value = "/orgusers") @RequestMapping(method = RequestMethod.POST, value = "/orgusers")
@PreAuthorize("@orguser_pms.check('CREATE')") @PreAuthorize("@orguser_pms.check('CREATE')")
public ResponseEntity<OrgUser> create(@RequestBody OrgUser orguser) { public ResponseEntity<OrgUser> create(@RequestBody OrgUser orguser) {
...@@ -87,7 +75,6 @@ public class OrgUserController { ...@@ -87,7 +75,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(orguser2); return ResponseEntity.status(HttpStatus.OK).body(orguser2);
} }
//@GlobalTransactional
@RequestMapping(method = RequestMethod.GET, value = "/orgusers/{orguser_id}") @RequestMapping(method = RequestMethod.GET, value = "/orgusers/{orguser_id}")
@PreAuthorize("@orguser_pms.check(#orguser_id,'READ')") @PreAuthorize("@orguser_pms.check(#orguser_id,'READ')")
public ResponseEntity<OrgUser> get(@PathVariable("orguser_id") String orguser_id) { public ResponseEntity<OrgUser> get(@PathVariable("orguser_id") String orguser_id) {
...@@ -95,7 +82,6 @@ public class OrgUserController { ...@@ -95,7 +82,6 @@ public class OrgUserController {
return ResponseEntity.status(HttpStatus.OK).body(orguser); return ResponseEntity.status(HttpStatus.OK).body(orguser);
} }
//@GlobalTransactional
@RequestMapping(method= RequestMethod.GET , value="/orgusers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/orgusers/fetchdefault")
@PreAuthorize("@orguser_pms.check('READ')") @PreAuthorize("@orguser_pms.check('READ')")
public ResponseEntity<List<OrgUser>> fetchDefault(OrgUserSearchContext searchContext,Pageable pageable) { public ResponseEntity<List<OrgUser>> fetchDefault(OrgUserSearchContext searchContext,Pageable pageable) {
...@@ -108,12 +94,5 @@ public class OrgUserController { ...@@ -108,12 +94,5 @@ public class OrgUserController {
.body(page.getContent()); .body(page.getContent());
} }
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
//@GlobalTransactional
} }
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/filter/OrgDeptSearchContext.java
浏览文件 @ 58029906
...@@ -7,10 +7,8 @@ import java.util.List; ...@@ -7,10 +7,8 @@ import java.util.List;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.log.IBIZLog;
@Data @Data
@IBIZLog
public class OrgDeptSearchContext extends SearchContext implements Serializable { public class OrgDeptSearchContext extends SearchContext implements Serializable {
public String n_orgdeptname_like;//[部门名称] public String n_orgdeptname_like;//[部门名称]
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/filter/OrgDeptUserSearchContext.java
浏览文件 @ 58029906
...@@ -7,10 +7,8 @@ import java.util.List; ...@@ -7,10 +7,8 @@ import java.util.List;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.log.IBIZLog;
@Data @Data
@IBIZLog
public class OrgDeptUserSearchContext extends SearchContext implements Serializable { public class OrgDeptUserSearchContext extends SearchContext implements Serializable {
public String n_orgdeptusername_like;//[部门用户名称] public String n_orgdeptusername_like;//[部门用户名称]
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/filter/OrgSearchContext.java
浏览文件 @ 58029906
...@@ -7,10 +7,8 @@ import java.util.List; ...@@ -7,10 +7,8 @@ import java.util.List;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.log.IBIZLog;
@Data @Data
@IBIZLog
public class OrgSearchContext extends SearchContext implements Serializable { public class OrgSearchContext extends SearchContext implements Serializable {
public String n_orgname_like;//[组织名称] public String n_orgname_like;//[组织名称]
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/filter/OrgUserSearchContext.java
浏览文件 @ 58029906
...@@ -7,10 +7,8 @@ import java.util.List; ...@@ -7,10 +7,8 @@ import java.util.List;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.log.IBIZLog;
@Data @Data
@IBIZLog
public class OrgUserSearchContext extends SearchContext implements Serializable { public class OrgUserSearchContext extends SearchContext implements Serializable {
public String n_orgusername_like;//[组织用户名称] public String n_orgusername_like;//[组织用户名称]
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgDeptService.java
浏览文件 @ 58029906
package com.ibiz.web.r7rt_org.service; package com.ibiz.web.r7rt_org.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
...@@ -12,14 +13,13 @@ import feign.Feign; ...@@ -12,14 +13,13 @@ import feign.Feign;
import feign.codec.Decoder; import feign.codec.Decoder;
import feign.codec.Encoder; import feign.codec.Encoder;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Service;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.r7rt_org.domain.OrgDept; import com.ibiz.web.r7rt_org.domain.OrgDept;
...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*; ...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.web.r7rt_org.feign.OrgDeptFeignClient; import com.ibiz.web.r7rt_org.feign.OrgDeptFeignClient;
import com.ibiz.web.WebApplication.WebClientProperties; import com.ibiz.web.WebApplication.WebClientProperties;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Service @Service
public class OrgDeptService { public class OrgDeptService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgDeptUserService.java
浏览文件 @ 58029906
package com.ibiz.web.r7rt_org.service; package com.ibiz.web.r7rt_org.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
...@@ -12,14 +13,13 @@ import feign.Feign; ...@@ -12,14 +13,13 @@ import feign.Feign;
import feign.codec.Decoder; import feign.codec.Decoder;
import feign.codec.Encoder; import feign.codec.Encoder;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Service;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.r7rt_org.domain.OrgDeptUser; import com.ibiz.web.r7rt_org.domain.OrgDeptUser;
...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*; ...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.web.r7rt_org.feign.OrgDeptUserFeignClient; import com.ibiz.web.r7rt_org.feign.OrgDeptUserFeignClient;
import com.ibiz.web.WebApplication.WebClientProperties; import com.ibiz.web.WebApplication.WebClientProperties;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Service @Service
public class OrgDeptUserService { public class OrgDeptUserService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgService.java
浏览文件 @ 58029906
package com.ibiz.web.r7rt_org.service; package com.ibiz.web.r7rt_org.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
...@@ -12,14 +13,13 @@ import feign.Feign; ...@@ -12,14 +13,13 @@ import feign.Feign;
import feign.codec.Decoder; import feign.codec.Decoder;
import feign.codec.Encoder; import feign.codec.Encoder;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Service;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.r7rt_org.domain.Org; import com.ibiz.web.r7rt_org.domain.Org;
...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*; ...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.web.r7rt_org.feign.OrgFeignClient; import com.ibiz.web.r7rt_org.feign.OrgFeignClient;
import com.ibiz.web.WebApplication.WebClientProperties; import com.ibiz.web.WebApplication.WebClientProperties;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Service @Service
public class OrgService { public class OrgService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgUserService.java
浏览文件 @ 58029906
package com.ibiz.web.r7rt_org.service; package com.ibiz.web.r7rt_org.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
...@@ -12,14 +13,13 @@ import feign.Feign; ...@@ -12,14 +13,13 @@ import feign.Feign;
import feign.codec.Decoder; import feign.codec.Decoder;
import feign.codec.Encoder; import feign.codec.Encoder;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Service;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.r7rt_org.domain.OrgUser; import com.ibiz.web.r7rt_org.domain.OrgUser;
...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*; ...@@ -27,10 +27,7 @@ import com.ibiz.web.r7rt_org.filter.*;
import com.ibiz.web.r7rt_org.feign.OrgUserFeignClient; import com.ibiz.web.r7rt_org.feign.OrgUserFeignClient;
import com.ibiz.web.WebApplication.WebClientProperties; import com.ibiz.web.WebApplication.WebClientProperties;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Service @Service
public class OrgUserService { public class OrgUserService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/rt/controller/SRFFileController.java
浏览文件 @ 58029906
package com.ibiz.web.rt.controller; package com.ibiz.web.rt.controller;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.web.rt.domain.SRFFILE; import com.ibiz.web.rt.domain.SRFFILE;
import com.ibiz.web.rt.domain.SRFFILEItem; import com.ibiz.web.rt.domain.SRFFILEItem;
import com.ibiz.web.rt.service.SRFFileService; import com.ibiz.web.rt.service.SRFFileService;
...@@ -18,13 +16,10 @@ import java.io.*; ...@@ -18,13 +16,10 @@ import java.io.*;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.UUID; import java.util.UUID;
import com.ibiz.util.log.IBIZLog;
/** /**
* 文件上传下载 * 文件上传下载
*/ */
@Slf4j
@IBIZLog
@RestController @RestController
@RequestMapping("/") @RequestMapping("/")
public class SRFFileController public class SRFFileController
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/rt/service/SRFFileService.java
浏览文件 @ 58029906
package com.ibiz.web.rt.service; package com.ibiz.web.rt.service;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.feign.FeignRequestInterceptor; import com.ibiz.util.feign.FeignRequestInterceptor;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.web.WebApplication; import com.ibiz.web.WebApplication;
...@@ -15,13 +13,9 @@ import feign.codec.Encoder; ...@@ -15,13 +13,9 @@ import feign.codec.Encoder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ibiz.util.log.IBIZLog;
/** /**
* 文件上传 * 文件上传
*/ */
@Slf4j
@IBIZLog
@Component @Component
public class SRFFileService { public class SRFFileService {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/cas/CasUserDetailsService.java
浏览文件 @ 58029906
...@@ -3,8 +3,9 @@ package com.ibiz.web.security.cas; ...@@ -3,8 +3,9 @@ package com.ibiz.web.security.cas;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.security.userdetail.LoginUser;
import com.ibiz.web.security.userdetail.LoginUserDetailService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.cas.authentication.CasAssertionAuthenticationToken; import org.springframework.security.cas.authentication.CasAssertionAuthenticationToken;
import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
...@@ -13,15 +14,9 @@ import org.springframework.security.core.userdetails.UserDetailsService; ...@@ -13,15 +14,9 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.util.security.userdetail.LoginUser;
import com.ibiz.web.security.userdetail.LoginUserDetailService;
import com.ibiz.util.log.IBIZLog;
/** /**
* 用于加载用户信息 实现UserDetailsService接口，或者实现AuthenticationUserDetailsService接口 * 用于加载用户信息 实现UserDetailsService接口，或者实现AuthenticationUserDetailsService接口
*/ */
@Slf4j
@IBIZLog
public class CasUserDetailsService implements AuthenticationUserDetailsService<CasAssertionAuthenticationToken> { public class CasUserDetailsService implements AuthenticationUserDetailsService<CasAssertionAuthenticationToken> {
@Autowired @Autowired
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/config/SecurityConfiguration.java
浏览文件 @ 58029906
package com.ibiz.web.security.config; package com.ibiz.web.security.config;
import lombok.extern.slf4j.Slf4j; import com.ibiz.web.security.cas.CasServerConfig;
import com.ibiz.web.security.filter.LoginFilter;
import com.ibiz.web.security.filter.TokenAuthenticationFilter;
import com.ibiz.web.security.token.TokenManager;
import com.ibiz.web.security.token.UnauthorizedEntryPoint;
import com.ibiz.web.security.userdetail.LoginUserDetailService;
import org.jasig.cas.client.session.SingleSignOutFilter; import org.jasig.cas.client.session.SingleSignOutFilter;
import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; import org.jasig.cas.client.session.SingleSignOutHttpSessionListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,14 +30,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; ...@@ -26,14 +30,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.web.cors.CorsUtils; import org.springframework.web.cors.CorsUtils;
import com.ibiz.web.security.cas.CasServerConfig;
import com.ibiz.web.security.filter.LoginFilter;
import com.ibiz.web.security.filter.TokenAuthenticationFilter;
import com.ibiz.web.security.token.TokenManager;
import com.ibiz.web.security.token.UnauthorizedEntryPoint;
import com.ibiz.web.security.userdetail.LoginUserDetailService;
@Slf4j
@EnableWebSecurity @EnableWebSecurity
@Configuration @Configuration
@EnableGlobalMethodSecurity(prePostEnabled=true) @EnableGlobalMethodSecurity(prePostEnabled=true)
...@@ -87,6 +83,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -87,6 +83,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
.addFilterBefore(singleSignOutFilter, CasAuthenticationFilter.class); .addFilterBefore(singleSignOutFilter, CasAuthenticationFilter.class);
http.antMatcher("/**"); http.antMatcher("/**");
} }
} }
@Autowired @Autowired
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/filter/LoginFilter.java
浏览文件 @ 58029906
package com.ibiz.web.security.filter; package com.ibiz.web.security.filter;
import java.util.ArrayList;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibiz.web.security.token.TokenManager;
import com.ibiz.util.security.userdetail.LoginUser;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.authentication.*; import org.springframework.security.authentication.*;
...@@ -20,12 +12,13 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; ...@@ -20,12 +12,13 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import com.ibiz.web.security.token.TokenManager; import javax.servlet.FilterChain;
import com.ibiz.util.security.userdetail.LoginUser; import javax.servlet.ServletException;
import com.ibiz.util.log.IBIZLog; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
@Slf4j
@IBIZLog
public class LoginFilter extends UsernamePasswordAuthenticationFilter { public class LoginFilter extends UsernamePasswordAuthenticationFilter {
private AuthenticationManager authenticationManager; private AuthenticationManager authenticationManager;
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/filter/TokenAuthenticationFilter.java
浏览文件 @ 58029906
package com.ibiz.web.security.filter; package com.ibiz.web.security.filter;
import javax.servlet.FilterChain; import com.ibiz.web.security.token.TokenManager;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import lombok.extern.slf4j.Slf4j;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
...@@ -16,11 +8,13 @@ import org.springframework.security.core.context.SecurityContextHolder; ...@@ -16,11 +8,13 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import com.ibiz.web.security.token.TokenManager; import javax.servlet.FilterChain;
import com.ibiz.util.log.IBIZLog; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
@Slf4j
@IBIZLog
public class TokenAuthenticationFilter extends BasicAuthenticationFilter { public class TokenAuthenticationFilter extends BasicAuthenticationFilter {
TokenManager tokenManager ; TokenManager tokenManager ;
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/permission/module/PSPermission.java
浏览文件 @ 58029906
...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.module; ...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.module;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page; ...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.ibiz.web.module.service.PSService; import com.ibiz.web.module.service.PSService;
import com.ibiz.web.module.domain.PS; import com.ibiz.web.module.domain.PS;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Component("ps_pms") @Component("ps_pms")
public class PSPermission { public class PSPermission {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/permission/r7rt_org/OrgDeptPermission.java
浏览文件 @ 58029906
...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org; ...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page; ...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgDeptService; import com.ibiz.web.r7rt_org.service.OrgDeptService;
import com.ibiz.web.r7rt_org.domain.OrgDept; import com.ibiz.web.r7rt_org.domain.OrgDept;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Component("orgdept_pms") @Component("orgdept_pms")
public class OrgDeptPermission { public class OrgDeptPermission {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/permission/r7rt_org/OrgDeptUserPermission.java
浏览文件 @ 58029906
...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org; ...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page; ...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgDeptUserService; import com.ibiz.web.r7rt_org.service.OrgDeptUserService;
import com.ibiz.web.r7rt_org.domain.OrgDeptUser; import com.ibiz.web.r7rt_org.domain.OrgDeptUser;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Component("orgdeptuser_pms") @Component("orgdeptuser_pms")
public class OrgDeptUserPermission { public class OrgDeptUserPermission {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/permission/r7rt_org/OrgPermission.java
浏览文件 @ 58029906
...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org; ...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page; ...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgService; import com.ibiz.web.r7rt_org.service.OrgService;
import com.ibiz.web.r7rt_org.domain.Org; import com.ibiz.web.r7rt_org.domain.Org;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Component("org_pms") @Component("org_pms")
public class OrgPermission { public class OrgPermission {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/permission/r7rt_org/OrgUserPermission.java
浏览文件 @ 58029906
...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org; ...@@ -3,10 +3,8 @@ package com.ibiz.web.security.permission.r7rt_org;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page; ...@@ -16,13 +14,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import com.ibiz.web.r7rt_org.service.OrgUserService; import com.ibiz.web.r7rt_org.service.OrgUserService;
import com.ibiz.web.r7rt_org.domain.OrgUser; import com.ibiz.web.r7rt_org.domain.OrgUser;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
@Component("orguser_pms") @Component("orguser_pms")
public class OrgUserPermission { public class OrgUserPermission {
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/token/TokenManager.java
浏览文件 @ 58029906
package com.ibiz.web.security.token; package com.ibiz.web.security.token;
import java.util.*;
import lombok.extern.slf4j.Slf4j;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Clock; import io.jsonwebtoken.Clock;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
...@@ -14,10 +10,9 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio ...@@ -14,10 +10,9 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import com.ibiz.util.log.IBIZLog;
@Slf4j import java.util.*;
@IBIZLog
public class TokenManager { public class TokenManager {
private static final long serialVersionUID = -3301605591108950415L; private static final long serialVersionUID = -3301605591108950415L;
private Clock clock = DefaultClock.INSTANCE; private Clock clock = DefaultClock.INSTANCE;
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/token/UnauthorizedEntryPoint.java
浏览文件 @ 58029906
package com.ibiz.web.security.token; package com.ibiz.web.security.token;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
...@@ -11,10 +9,7 @@ import javax.servlet.ServletException; ...@@ -11,10 +9,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import com.ibiz.util.log.IBIZLog;
@Slf4j
@IBIZLog
public class UnauthorizedEntryPoint implements AuthenticationEntryPoint { public class UnauthorizedEntryPoint implements AuthenticationEntryPoint {
@Override @Override
......
ps-app/ps-app-web/src/main/java/com/ibiz/web/security/userdetail/LoginUser.java
浏览文件 @ 58029906
package com.ibiz.web.security.userdetail; package com.ibiz.web.security.userdetail;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import java.util.Collection; import java.util.Collection;
@Slf4j
public class LoginUser extends org.springframework.security.core.userdetails.User { public class LoginUser extends org.springframework.security.core.userdetails.User {
private String userId ; private String userId ;
......
ps-boot/src/main/java/com/ibiz/PSApplication.java
浏览文件 @ 58029906
...@@ -2,12 +2,8 @@ package com.ibiz; ...@@ -2,12 +2,8 @@ package com.ibiz;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import io.seata.spring.annotation.datasource.EnableAutoDataSourceProxy;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
...@@ -18,11 +14,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -18,11 +14,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibiz.util.web.SearchContextHandlerMethodArgumentResolver; import com.ibiz.util.web.SearchContextHandlerMethodArgumentResolver;
import com.ibiz.util.serialize.DomainSerializerProvider; import com.ibiz.util.serialize.DomainSerializerProvider;
import com.ibiz.util.helper.UniqueNameGenerator; import com.ibiz.util.helper.UniqueNameGenerator;
@Slf4j
@SpringBootApplication(exclude = { @SpringBootApplication(exclude = {
}) })
...@@ -33,7 +29,6 @@ import com.ibiz.util.helper.UniqueNameGenerator; ...@@ -33,7 +29,6 @@ import com.ibiz.util.helper.UniqueNameGenerator;
@Configuration @Configuration
@ComponentScan(nameGenerator = UniqueNameGenerator.class) @ComponentScan(nameGenerator = UniqueNameGenerator.class)
@EnableTransactionManagement @EnableTransactionManagement
//@EnableAutoDataSourceProxy
public class PSApplication extends WebMvcConfigurerAdapter { public class PSApplication extends WebMvcConfigurerAdapter {
public static void main(String[] args) { public static void main(String[] args) {
......
ps-client/ps-client-htsc/src/main/java/com/ibiz/client/htsc/service/healthcheckClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.Ihealthcheck; import com.ibiz.core.client.model.Ihealthcheck;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[healthcheck] 服务对象接口 * 实体[healthcheck] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class healthcheckClientServiceImpl implements IhealthcheckClientService { public class healthcheckClientServiceImpl implements IhealthcheckClientService {
......
ps-client/ps-client-im/src/main/java/com/ibiz/client/im/service/IMClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.IIM; import com.ibiz.core.client.model.IIM;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[IM] 服务对象接口 * 实体[IM] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class IMClientServiceImpl implements IIMClientService { public class IMClientServiceImpl implements IIMClientService {
......
ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.IOrg; import com.ibiz.core.client.model.IOrg;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[Org] 服务对象接口 * 实体[Org] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class OrgClientServiceImpl implements IOrgClientService { public class OrgClientServiceImpl implements IOrgClientService {
......
ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgDeptClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.IOrgDept; import com.ibiz.core.client.model.IOrgDept;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[OrgDept] 服务对象接口 * 实体[OrgDept] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class OrgDeptClientServiceImpl implements IOrgDeptClientService { public class OrgDeptClientServiceImpl implements IOrgDeptClientService {
......
ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgDeptUserClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.IOrgDeptUser; import com.ibiz.core.client.model.IOrgDeptUser;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[OrgDeptUser] 服务对象接口 * 实体[OrgDeptUser] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class OrgDeptUserClientServiceImpl implements IOrgDeptUserClientService { public class OrgDeptUserClientServiceImpl implements IOrgDeptUserClientService {
......
ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgUserClientServiceImpl.java
浏览文件 @ 58029906
...@@ -5,15 +5,6 @@ import java.util.ArrayList; ...@@ -5,15 +5,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ibiz.core.client.model.IOrgUser; import com.ibiz.core.client.model.IOrgUser;
...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page; ...@@ -31,13 +22,15 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.ibiz.util.feign.suport.SearchContextFeignEncode; import com.ibiz.util.feign.suport.SearchContextFeignEncode;
import com.ibiz.util.log.IBIZLog; import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.codec.Decoder;
import feign.codec.Encoder;
/** /**
* 实体[OrgUser] 服务对象接口 * 实体[OrgUser] 服务对象接口
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class OrgUserClientServiceImpl implements IOrgUserClientService { public class OrgUserClientServiceImpl implements IOrgUserClientService {
......
ps-core/src/main/java/com/ibiz/core/config/DroolsAutoConfiguration.java
浏览文件 @ 58029906
...@@ -13,16 +13,11 @@ import org.springframework.context.annotation.Configuration; ...@@ -13,16 +13,11 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.IOException; import java.io.IOException;
import java.util.List;
@Configuration @Configuration
public class DroolsAutoConfiguration { public class DroolsAutoConfiguration {
private Log logger= LogFactory.getLog(DroolsAutoConfiguration.class);
private static final String RULES_PATH = "rules/"; private static final String RULES_PATH = "rules/";
@Bean @Bean
...@@ -54,18 +49,6 @@ public class DroolsAutoConfiguration { ...@@ -54,18 +49,6 @@ public class DroolsAutoConfiguration {
KieBuilder kieBuilder = getKieServices().newKieBuilder(kieFileSystem()); KieBuilder kieBuilder = getKieServices().newKieBuilder(kieFileSystem());
kieBuilder.buildAll(); kieBuilder.buildAll();
if(kieBuilder.getResults().hasMessages(new Message.Level[] { Message.Level.ERROR })){
List<Message> errors = kieBuilder.getResults().getMessages(new Message.Level[] { Message.Level.ERROR });
StringBuilder stringBuilder = new StringBuilder("Errors:");
for (Message msg : errors)
{
stringBuilder.append(new StringBuilder().append("\n ").append(prettyBuildMessage(msg)).toString());
}
logger.error(String.format("初始化处理逻辑发生异常，异常原因为[%s]",stringBuilder.toString()));
//忽略处理逻辑
getKieServices().newKieBuilder(getKieServices().newKieFileSystem()).buildAll();
}
return getKieServices().newKieContainer(kieRepository.getDefaultReleaseId()); return getKieServices().newKieContainer(kieRepository.getDefaultReleaseId());
} }
...@@ -90,15 +73,4 @@ public class DroolsAutoConfiguration { ...@@ -90,15 +73,4 @@ public class DroolsAutoConfiguration {
public KModuleBeanFactoryPostProcessor kiePostProcessor() { public KModuleBeanFactoryPostProcessor kiePostProcessor() {
return new KModuleBeanFactoryPostProcessor(); return new KModuleBeanFactoryPostProcessor();
} }
/**
* 输出异常信息
* @param msg
* @return
*/
public static String prettyBuildMessage(Message msg)
{
return new StringBuilder().append("Message: {id=").append(msg.getId()).append(", level=").append(msg.getLevel()).append(", path=").append(msg.getPath()).append(", line=").append(msg.getLine())
.append(", column=").append(msg.getColumn()).append(", text=\"").append(msg.getText()).append("\"}").toString();
}
} }
\ No newline at end of file
ps-core/src/main/java/com/ibiz/core/module/domain/PS.java
浏览文件 @ 58029906
...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField; ...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.core.util.annotation.DEField;
import com.ibiz.core.util.annotation.DEPredefinedField;
import com.ibiz.core.util.enums.DEPredefinedFieldFillMode;
import com.ibiz.core.util.enums.DEPredefinedFieldType;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -27,7 +23,6 @@ public class PS implements Serializable { ...@@ -27,7 +23,6 @@ public class PS implements Serializable {
/** /**
* 更新时间 * 更新时间
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT_UPDATE,preType = DEPredefinedFieldType.UPDATEDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
private Timestamp updateDate; private Timestamp updateDate;
...@@ -38,7 +33,6 @@ public class PS implements Serializable { ...@@ -38,7 +33,6 @@ public class PS implements Serializable {
/** /**
* 更新人 * 更新人
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT_UPDATE,preType = DEPredefinedFieldType.UPDATEMAN)
private String updateMan; private String updateMan;
@JsonIgnore @JsonIgnore
...@@ -57,7 +51,6 @@ public class PS implements Serializable { ...@@ -57,7 +51,6 @@ public class PS implements Serializable {
/** /**
* 建立时间 * 建立时间
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT,preType = DEPredefinedFieldType.CREATEDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
private Timestamp createDate; private Timestamp createDate;
...@@ -77,7 +70,6 @@ public class PS implements Serializable { ...@@ -77,7 +70,6 @@ public class PS implements Serializable {
/** /**
* 建立人 * 建立人
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT,preType = DEPredefinedFieldType.CREATEMAN)
private String createMan; private String createMan;
@JsonIgnore @JsonIgnore
...@@ -87,7 +79,6 @@ public class PS implements Serializable { ...@@ -87,7 +79,6 @@ public class PS implements Serializable {
/** /**
* 采购单标识 * 采购单标识
*/ */
@DEField(isKeyField=true)
private String pSId; private String pSId;
@JsonIgnore @JsonIgnore
......
ps-core/src/main/java/com/ibiz/core/module/filter/PSSearchContext.java
浏览文件 @ 58029906
...@@ -6,27 +6,22 @@ import java.util.ArrayList; ...@@ -6,27 +6,22 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.ISearchFilter; import com.ibiz.util.ISearchFilter;
import com.ibiz.util.domain.DataObj; import com.ibiz.util.domain.DataObj;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.SearchFieldFilter; import com.ibiz.util.SearchFieldFilter;
import com.ibiz.util.enums.SearchFieldType; import com.ibiz.util.enums.SearchFieldType;
import com.ibiz.util.enums.SearchGroupType; import com.ibiz.util.enums.SearchGroupType;
import com.ibiz.util.SearchGroupFilter; import com.ibiz.util.SearchGroupFilter;
import com.ibiz.util.log.IBIZLog; import lombok.Data;
/** /**
* 关系型数据实体[PS] 查询条件对象 * 关系型数据实体[PS] 查询条件对象
*/ */
@Slf4j
@Data @Data
@IBIZLog
public class PSSearchContext extends SearchContext { public class PSSearchContext extends SearchContext {
public String n_psname_like;//[采购单名称] public String n_psname_like;//[采购单名称]
public void setN_psname_like(String n_psname_like) { public void setN_psname_like(String n_psname_like) {
this.n_psname_like=n_psname_like; this.n_psname_like=n_psname_like;
......
ps-core/src/main/java/com/ibiz/core/module/service/IPSService.java
浏览文件 @ 58029906
package com.ibiz.core.module.service; package com.ibiz.core.module.service;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Collection;
import java.math.BigInteger; import java.math.BigInteger;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
......
ps-core/src/main/java/com/ibiz/core/module/service/impl/PSServiceImpl.java
浏览文件 @ 58029906
package com.ibiz.core.module.service.impl; package com.ibiz.core.module.service.impl;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
...@@ -23,14 +17,12 @@ import com.ibiz.core.module.filter.PSSearchContext; ...@@ -23,14 +17,12 @@ import com.ibiz.core.module.filter.PSSearchContext;
import com.ibiz.core.module.service.IPSService; import com.ibiz.core.module.service.IPSService;
import com.ibiz.core.module.service.logic.IPSXDLogic; import com.ibiz.core.module.service.logic.IPSXDLogic;
import com.ibiz.core.module.service.logic.IPSCreateAndStartIMLogic; import com.ibiz.core.module.service.logic.IPSCreateAndStartIMLogic;
import org.springframework.beans.factory.annotation.Autowired;
import com.ibiz.util.SearchResult; import com.ibiz.util.SearchResult;
import com.ibiz.util.log.IBIZLog;
/** /**
* 实体[采购单] 服务对象接口实现 * 实体[采购单] 服务对象接口实现
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class PSServiceImpl implements IPSService { public class PSServiceImpl implements IPSService {
...@@ -138,9 +130,6 @@ public class PSServiceImpl implements IPSService { ...@@ -138,9 +130,6 @@ public class PSServiceImpl implements IPSService {
*/ */
@Override @Override
public Page<PS> searchDefault(PSSearchContext context) { public Page<PS> searchDefault(PSSearchContext context) {
List dataQueryList=new ArrayList();
dataQueryList.add("Default");
context.setDataQueryList(dataQueryList);
List<PS> list = new ArrayList<PS>(); List<PS> list = new ArrayList<PS>();
Page<com.ibiz.core.repository.po.PS> t_PSs = pSRepository.searchDefault(context) ; Page<com.ibiz.core.repository.po.PS> t_PSs = pSRepository.searchDefault(context) ;
for(com.ibiz.core.repository.po.PS t_PS : t_PSs){ for(com.ibiz.core.repository.po.PS t_PS : t_PSs){
......
ps-core/src/main/java/com/ibiz/core/module/service/logic/impl/PSCreateAndStartIMLogicImpl.java
浏览文件 @ 58029906
...@@ -6,22 +6,16 @@ import java.util.List; ...@@ -6,22 +6,16 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j; import com.ibiz.core.module.service.logic.IPSCreateAndStartIMLogic;
import com.ibiz.core.module.domain.PS;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.kie.api.runtime.KieSession; import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieContainer;
import com.ibiz.core.module.service.logic.IPSCreateAndStartIMLogic;
import com.ibiz.core.module.domain.PS;
import com.ibiz.util.log.IBIZLog;
/** /**
* 关系型数据实体[CreateAndStartIM] 对象 * 关系型数据实体[CreateAndStartIM] 对象
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class PSCreateAndStartIMLogicImpl implements IPSCreateAndStartIMLogic{ public class PSCreateAndStartIMLogicImpl implements IPSCreateAndStartIMLogic{
......
ps-core/src/main/java/com/ibiz/core/module/service/logic/impl/PSXDLogicImpl.java
浏览文件 @ 58029906
...@@ -6,22 +6,16 @@ import java.util.List; ...@@ -6,22 +6,16 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.extern.slf4j.Slf4j; import com.ibiz.core.module.service.logic.IPSXDLogic;
import com.ibiz.core.module.domain.PS;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.kie.api.runtime.KieSession; import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieContainer;
import com.ibiz.core.module.service.logic.IPSXDLogic;
import com.ibiz.core.module.domain.PS;
import com.ibiz.util.log.IBIZLog;
/** /**
* 关系型数据实体[XD] 对象 * 关系型数据实体[XD] 对象
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class PSXDLogicImpl implements IPSXDLogic{ public class PSXDLogicImpl implements IPSXDLogic{
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSBzDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSBzDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSBzDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[2000] * 值规则信息：内容长度必须小于等于[2000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSBzDefaultValidator") @Component("PSBzDefaultValidator")
public class PSBzDefaultValidator implements ConstraintValidator<PSBzDefault, String>,Validator { public class PSBzDefaultValidator implements ConstraintValidator<PSBzDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[2000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[2000]】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSCreateDateDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSCreateDateDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSCreateDateDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSCreateDateDefaultValidator") @Component("PSCreateDateDefaultValidator")
public class PSCreateDateDefaultValidator implements ConstraintValidator<PSCreateDateDefault, Timestamp>,Validator { public class PSCreateDateDefaultValidator implements ConstraintValidator<PSCreateDateDefault, Timestamp>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSCreateManDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSCreateManDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSCreateManDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSCreateManDefaultValidator") @Component("PSCreateManDefaultValidator")
public class PSCreateManDefaultValidator implements ConstraintValidator<PSCreateManDefault, String>,Validator { public class PSCreateManDefaultValidator implements ConstraintValidator<PSCreateManDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSNgridDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSNgridDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSNgridDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSNgridDefaultValidator") @Component("PSNgridDefaultValidator")
public class PSNgridDefaultValidator implements ConstraintValidator<PSNgridDefault, String>,Validator { public class PSNgridDefaultValidator implements ConstraintValidator<PSNgridDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSPSIdDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSPSIdDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSPSIdDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSPSIdDefaultValidator") @Component("PSPSIdDefaultValidator")
public class PSPSIdDefaultValidator implements ConstraintValidator<PSPSIdDefault, String>,Validator { public class PSPSIdDefaultValidator implements ConstraintValidator<PSPSIdDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSPSNameDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSPSNameDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSPSNameDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[200] * 值规则信息：内容长度必须小于等于[200]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSPSNameDefaultValidator") @Component("PSPSNameDefaultValidator")
public class PSPSNameDefaultValidator implements ConstraintValidator<PSPSNameDefault, String>,Validator { public class PSPSNameDefaultValidator implements ConstraintValidator<PSPSNameDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[200]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[200]】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSUpdateDateDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSUpdateDateDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSUpdateDateDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSUpdateDateDefaultValidator") @Component("PSUpdateDateDefaultValidator")
public class PSUpdateDateDefaultValidator implements ConstraintValidator<PSUpdateDateDefault, Timestamp>,Validator { public class PSUpdateDateDefaultValidator implements ConstraintValidator<PSUpdateDateDefault, Timestamp>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module/valuerule/validator/ps/PSUpdateManDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module.valuerule.validator.ps; package com.ibiz.core.module.valuerule.validator.ps;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSUpdateManDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module.valuerule.anno.ps.PSUpdateManDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("PSUpdateManDefaultValidator") @Component("PSUpdateManDefaultValidator")
public class PSUpdateManDefaultValidator implements ConstraintValidator<PSUpdateManDefault, String>,Validator { public class PSUpdateManDefaultValidator implements ConstraintValidator<PSUpdateManDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/domain/Healthcheck.java
浏览文件 @ 58029906
...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField; ...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.core.util.annotation.DEField;
import com.ibiz.core.util.annotation.DEPredefinedField;
import com.ibiz.core.util.enums.DEPredefinedFieldFillMode;
import com.ibiz.core.util.enums.DEPredefinedFieldType;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -27,7 +23,6 @@ public class Healthcheck implements Serializable { ...@@ -27,7 +23,6 @@ public class Healthcheck implements Serializable {
/** /**
* HEALTHCHECKID * HEALTHCHECKID
*/ */
@DEField(isKeyField=true)
private String healthcheckid; private String healthcheckid;
@JsonIgnore @JsonIgnore
......
ps-core/src/main/java/com/ibiz/core/module2/domain/IM.java
浏览文件 @ 58029906
...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField; ...@@ -11,10 +11,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.core.util.annotation.DEField;
import com.ibiz.core.util.annotation.DEPredefinedField;
import com.ibiz.core.util.enums.DEPredefinedFieldFillMode;
import com.ibiz.core.util.enums.DEPredefinedFieldType;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -72,7 +68,6 @@ public class IM implements Serializable { ...@@ -72,7 +68,6 @@ public class IM implements Serializable {
/** /**
* 建立时间 * 建立时间
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT,preType = DEPredefinedFieldType.CREATEDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
private Timestamp createDate; private Timestamp createDate;
...@@ -182,7 +177,6 @@ public class IM implements Serializable { ...@@ -182,7 +177,6 @@ public class IM implements Serializable {
/** /**
* 更新时间 * 更新时间
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT_UPDATE,preType = DEPredefinedFieldType.UPDATEDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
private Timestamp updateDate; private Timestamp updateDate;
...@@ -193,7 +187,6 @@ public class IM implements Serializable { ...@@ -193,7 +187,6 @@ public class IM implements Serializable {
/** /**
* 重要事项标识 * 重要事项标识
*/ */
@DEField(isKeyField=true)
private String iMId; private String iMId;
@JsonIgnore @JsonIgnore
...@@ -257,7 +250,6 @@ public class IM implements Serializable { ...@@ -257,7 +250,6 @@ public class IM implements Serializable {
/** /**
* 建立人 * 建立人
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT,preType = DEPredefinedFieldType.CREATEMAN)
private String createMan; private String createMan;
@JsonIgnore @JsonIgnore
...@@ -294,7 +286,6 @@ public class IM implements Serializable { ...@@ -294,7 +286,6 @@ public class IM implements Serializable {
/** /**
* 更新人 * 更新人
*/ */
@DEPredefinedField(fill= DEPredefinedFieldFillMode.INSERT_UPDATE,preType = DEPredefinedFieldType.UPDATEMAN)
private String updateMan; private String updateMan;
@JsonIgnore @JsonIgnore
......
ps-core/src/main/java/com/ibiz/core/module2/filter/HealthcheckSearchContext.java
浏览文件 @ 58029906
...@@ -6,27 +6,22 @@ import java.util.ArrayList; ...@@ -6,27 +6,22 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.ISearchFilter; import com.ibiz.util.ISearchFilter;
import com.ibiz.util.domain.DataObj; import com.ibiz.util.domain.DataObj;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.SearchFieldFilter; import com.ibiz.util.SearchFieldFilter;
import com.ibiz.util.enums.SearchFieldType; import com.ibiz.util.enums.SearchFieldType;
import com.ibiz.util.enums.SearchGroupType; import com.ibiz.util.enums.SearchGroupType;
import com.ibiz.util.SearchGroupFilter; import com.ibiz.util.SearchGroupFilter;
import com.ibiz.util.log.IBIZLog; import lombok.Data;
/** /**
* 关系型数据实体[Healthcheck] 查询条件对象 * 关系型数据实体[Healthcheck] 查询条件对象
*/ */
@Slf4j
@Data @Data
@IBIZLog
public class HealthcheckSearchContext extends SearchContext { public class HealthcheckSearchContext extends SearchContext {
public String n_healthcheckid_like;//[HEALTHCHECKID] public String n_healthcheckid_like;//[HEALTHCHECKID]
public void setN_healthcheckid_like(String n_healthcheckid_like) { public void setN_healthcheckid_like(String n_healthcheckid_like) {
this.n_healthcheckid_like=n_healthcheckid_like; this.n_healthcheckid_like=n_healthcheckid_like;
......
ps-core/src/main/java/com/ibiz/core/module2/filter/IMSearchContext.java
浏览文件 @ 58029906
...@@ -6,27 +6,22 @@ import java.util.ArrayList; ...@@ -6,27 +6,22 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.ISearchFilter; import com.ibiz.util.ISearchFilter;
import com.ibiz.util.domain.DataObj; import com.ibiz.util.domain.DataObj;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ibiz.util.SearchContext; import com.ibiz.util.SearchContext;
import com.ibiz.util.SearchFieldFilter; import com.ibiz.util.SearchFieldFilter;
import com.ibiz.util.enums.SearchFieldType; import com.ibiz.util.enums.SearchFieldType;
import com.ibiz.util.enums.SearchGroupType; import com.ibiz.util.enums.SearchGroupType;
import com.ibiz.util.SearchGroupFilter; import com.ibiz.util.SearchGroupFilter;
import com.ibiz.util.log.IBIZLog; import lombok.Data;
/** /**
* 关系型数据实体[IM] 查询条件对象 * 关系型数据实体[IM] 查询条件对象
*/ */
@Slf4j
@Data @Data
@IBIZLog
public class IMSearchContext extends SearchContext { public class IMSearchContext extends SearchContext {
public String n_sblb_eq;//[申报类别] public String n_sblb_eq;//[申报类别]
public void setN_sblb_eq(String n_sblb_eq) { public void setN_sblb_eq(String n_sblb_eq) {
this.n_sblb_eq=n_sblb_eq; this.n_sblb_eq=n_sblb_eq;
......
ps-core/src/main/java/com/ibiz/core/module2/service/IHealthcheckService.java
浏览文件 @ 58029906
package com.ibiz.core.module2.service; package com.ibiz.core.module2.service;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Collection;
import java.math.BigInteger; import java.math.BigInteger;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
...@@ -35,14 +33,4 @@ public interface IHealthcheckService{ ...@@ -35,14 +33,4 @@ public interface IHealthcheckService{
*/ */
Page<Healthcheck> searchDefault(HealthcheckSearchContext context) ; Page<Healthcheck> searchDefault(HealthcheckSearchContext context) ;
/**
* 转换ClientModel为Domain
*/
public Healthcheck convert2Domain(com.ibiz.core.client.model.Ihealthcheck model ,Healthcheck domain);
/**
* 转换Domain为ClientModel
*/
public com.ibiz.core.client.model.Ihealthcheck convert2Model(Healthcheck domain , com.ibiz.core.client.model.Ihealthcheck model);
} }
ps-core/src/main/java/com/ibiz/core/module2/service/IIMService.java
浏览文件 @ 58029906
package com.ibiz.core.module2.service; package com.ibiz.core.module2.service;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Collection;
import java.math.BigInteger; import java.math.BigInteger;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
...@@ -35,14 +33,4 @@ public interface IIMService{ ...@@ -35,14 +33,4 @@ public interface IIMService{
*/ */
Page<IM> searchDefault(IMSearchContext context) ; Page<IM> searchDefault(IMSearchContext context) ;
/**
* 转换ClientModel为Domain
*/
public IM convert2Domain(com.ibiz.core.client.model.IIM model ,IM domain);
/**
* 转换Domain为ClientModel
*/
public com.ibiz.core.client.model.IIM convert2Model(IM domain , com.ibiz.core.client.model.IIM model);
} }
ps-core/src/main/java/com/ibiz/core/module2/service/impl/HealthcheckServiceImpl.java
浏览文件 @ 58029906
package com.ibiz.core.module2.service.impl; package com.ibiz.core.module2.service.impl;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
...@@ -21,14 +15,12 @@ import com.ibiz.core.client.model.Ihealthcheck; ...@@ -21,14 +15,12 @@ import com.ibiz.core.client.model.Ihealthcheck;
import com.ibiz.core.module2.domain.Healthcheck; import com.ibiz.core.module2.domain.Healthcheck;
import com.ibiz.core.module2.filter.HealthcheckSearchContext; import com.ibiz.core.module2.filter.HealthcheckSearchContext;
import com.ibiz.core.module2.service.IHealthcheckService; import com.ibiz.core.module2.service.IHealthcheckService;
import org.springframework.beans.factory.annotation.Autowired;
import com.ibiz.util.SearchResult; import com.ibiz.util.SearchResult;
import com.ibiz.util.log.IBIZLog;
/** /**
* 实体[HEALTHCHECK] 服务对象接口实现 * 实体[HEALTHCHECK] 服务对象接口实现
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class HealthcheckServiceImpl implements IHealthcheckService { public class HealthcheckServiceImpl implements IHealthcheckService {
...@@ -129,7 +121,6 @@ public class HealthcheckServiceImpl implements IHealthcheckService { ...@@ -129,7 +121,6 @@ public class HealthcheckServiceImpl implements IHealthcheckService {
@Override
public Ihealthcheck convert2Model(Healthcheck domain , Ihealthcheck model) { public Ihealthcheck convert2Model(Healthcheck domain , Ihealthcheck model) {
if(domain == null) if(domain == null)
return model ; return model ;
...@@ -142,7 +133,6 @@ public class HealthcheckServiceImpl implements IHealthcheckService { ...@@ -142,7 +133,6 @@ public class HealthcheckServiceImpl implements IHealthcheckService {
return model ; return model ;
} }
@Override
public Healthcheck convert2Domain( Ihealthcheck model ,Healthcheck domain) { public Healthcheck convert2Domain( Ihealthcheck model ,Healthcheck domain) {
if(model == null) if(model == null)
return domain ; return domain ;
......
ps-core/src/main/java/com/ibiz/core/module2/service/impl/IMServiceImpl.java
浏览文件 @ 58029906
package com.ibiz.core.module2.service.impl; package com.ibiz.core.module2.service.impl;
import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
...@@ -21,14 +15,12 @@ import com.ibiz.core.client.model.IIM; ...@@ -21,14 +15,12 @@ import com.ibiz.core.client.model.IIM;
import com.ibiz.core.module2.domain.IM; import com.ibiz.core.module2.domain.IM;
import com.ibiz.core.module2.filter.IMSearchContext; import com.ibiz.core.module2.filter.IMSearchContext;
import com.ibiz.core.module2.service.IIMService; import com.ibiz.core.module2.service.IIMService;
import org.springframework.beans.factory.annotation.Autowired;
import com.ibiz.util.SearchResult; import com.ibiz.util.SearchResult;
import com.ibiz.util.log.IBIZLog;
/** /**
* 实体[重要事项] 服务对象接口实现 * 实体[重要事项] 服务对象接口实现
*/ */
@Slf4j
@IBIZLog
@Service @Service
public class IMServiceImpl implements IIMService { public class IMServiceImpl implements IIMService {
...@@ -129,7 +121,6 @@ public class IMServiceImpl implements IIMService { ...@@ -129,7 +121,6 @@ public class IMServiceImpl implements IIMService {
@Override
public IIM convert2Model(IM domain , IIM model) { public IIM convert2Model(IM domain , IIM model) {
if(domain == null) if(domain == null)
return model ; return model ;
...@@ -212,7 +203,6 @@ public class IMServiceImpl implements IIMService { ...@@ -212,7 +203,6 @@ public class IMServiceImpl implements IIMService {
return model ; return model ;
} }
@Override
public IM convert2Domain( IIM model ,IM domain) { public IM convert2Domain( IIM model ,IM domain) {
if(model == null) if(model == null)
return domain ; return domain ;
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/healthcheck/HealthcheckHealthcheckidDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.healthcheck; package com.ibiz.core.module2.valuerule.validator.healthcheck;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.healthcheck.HealthcheckHealthcheckidDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.healthcheck.HealthcheckHealthcheckidDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("HealthcheckHealthcheckidDefaultValidator") @Component("HealthcheckHealthcheckidDefaultValidator")
public class HealthcheckHealthcheckidDefaultValidator implements ConstraintValidator<HealthcheckHealthcheckidDefault, String>,Validator { public class HealthcheckHealthcheckidDefaultValidator implements ConstraintValidator<HealthcheckHealthcheckidDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMBmldDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBmldDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBmldDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMBmldDefaultValidator") @Component("IMBmldDefaultValidator")
public class IMBmldDefaultValidator implements ConstraintValidator<IMBmldDefault, String>,Validator { public class IMBmldDefaultValidator implements ConstraintValidator<IMBmldDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMBmldidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBmldidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBmldidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMBmldidsDefaultValidator") @Component("IMBmldidsDefaultValidator")
public class IMBmldidsDefaultValidator implements ConstraintValidator<IMBmldidsDefault, String>,Validator { public class IMBmldidsDefaultValidator implements ConstraintValidator<IMBmldidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMBzDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBzDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMBzDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[2000] * 值规则信息：内容长度必须小于等于[2000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMBzDefaultValidator") @Component("IMBzDefaultValidator")
public class IMBzDefaultValidator implements ConstraintValidator<IMBzDefault, String>,Validator { public class IMBzDefaultValidator implements ConstraintValidator<IMBzDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[2000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[2000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMCreateDateDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMCreateDateDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMCreateDateDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMCreateDateDefaultValidator") @Component("IMCreateDateDefaultValidator")
public class IMCreateDateDefaultValidator implements ConstraintValidator<IMCreateDateDefault, Timestamp>,Validator { public class IMCreateDateDefaultValidator implements ConstraintValidator<IMCreateDateDefault, Timestamp>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMCreateManDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMCreateManDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMCreateManDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMCreateManDefaultValidator") @Component("IMCreateManDefaultValidator")
public class IMCreateManDefaultValidator implements ConstraintValidator<IMCreateManDefault, String>,Validator { public class IMCreateManDefaultValidator implements ConstraintValidator<IMCreateManDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMHjcdDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHjcdDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHjcdDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMHjcdDefaultValidator") @Component("IMHjcdDefaultValidator")
public class IMHjcdDefaultValidator implements ConstraintValidator<IMHjcdDefault, String>,Validator { public class IMHjcdDefaultValidator implements ConstraintValidator<IMHjcdDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMHqbmDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHqbmDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHqbmDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMHqbmDefaultValidator") @Component("IMHqbmDefaultValidator")
public class IMHqbmDefaultValidator implements ConstraintValidator<IMHqbmDefault, String>,Validator { public class IMHqbmDefaultValidator implements ConstraintValidator<IMHqbmDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMHqbmidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHqbmidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMHqbmidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMHqbmidsDefaultValidator") @Component("IMHqbmidsDefaultValidator")
public class IMHqbmidsDefaultValidator implements ConstraintValidator<IMHqbmidsDefault, String>,Validator { public class IMHqbmidsDefaultValidator implements ConstraintValidator<IMHqbmidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMIMIdDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMIMIdDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMIMIdDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMIMIdDefaultValidator") @Component("IMIMIdDefaultValidator")
public class IMIMIdDefaultValidator implements ConstraintValidator<IMIMIdDefault, String>,Validator { public class IMIMIdDefaultValidator implements ConstraintValidator<IMIMIdDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMIMNameDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMIMNameDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMIMNameDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[200] * 值规则信息：内容长度必须小于等于[200]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMIMNameDefaultValidator") @Component("IMIMNameDefaultValidator")
public class IMIMNameDefaultValidator implements ConstraintValidator<IMIMNameDefault, String>,Validator { public class IMIMNameDefaultValidator implements ConstraintValidator<IMIMNameDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[200]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[200]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMImwfstateDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMImwfstateDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMImwfstateDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMImwfstateDefaultValidator") @Component("IMImwfstateDefaultValidator")
public class IMImwfstateDefaultValidator implements ConstraintValidator<IMImwfstateDefault, String>,Validator { public class IMImwfstateDefaultValidator implements ConstraintValidator<IMImwfstateDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMJjyyDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMJjyyDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMJjyyDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMJjyyDefaultValidator") @Component("IMJjyyDefaultValidator")
public class IMJjyyDefaultValidator implements ConstraintValidator<IMJjyyDefault, String>,Validator { public class IMJjyyDefaultValidator implements ConstraintValidator<IMJjyyDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMKgsbmDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsbmDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsbmDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMKgsbmDefaultValidator") @Component("IMKgsbmDefaultValidator")
public class IMKgsbmDefaultValidator implements ConstraintValidator<IMKgsbmDefault, String>,Validator { public class IMKgsbmDefaultValidator implements ConstraintValidator<IMKgsbmDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMKgsbmidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsbmidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsbmidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMKgsbmidsDefaultValidator") @Component("IMKgsbmidsDefaultValidator")
public class IMKgsbmidsDefaultValidator implements ConstraintValidator<IMKgsbmidsDefault, String>,Validator { public class IMKgsbmidsDefaultValidator implements ConstraintValidator<IMKgsbmidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMKgsldDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsldDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsldDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[500] * 值规则信息：内容长度必须小于等于[500]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMKgsldDefaultValidator") @Component("IMKgsldDefaultValidator")
public class IMKgsldDefaultValidator implements ConstraintValidator<IMKgsldDefault, String>,Validator { public class IMKgsldDefaultValidator implements ConstraintValidator<IMKgsldDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMKgsldidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsldidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMKgsldidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[500] * 值规则信息：内容长度必须小于等于[500]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMKgsldidsDefaultValidator") @Component("IMKgsldidsDefaultValidator")
public class IMKgsldidsDefaultValidator implements ConstraintValidator<IMKgsldidsDefault, String>,Validator { public class IMKgsldidsDefaultValidator implements ConstraintValidator<IMKgsldidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMLcbhDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLcbhDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLcbhDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMLcbhDefaultValidator") @Component("IMLcbhDefaultValidator")
public class IMLcbhDefaultValidator implements ConstraintValidator<IMLcbhDefault, String>,Validator { public class IMLcbhDefaultValidator implements ConstraintValidator<IMLcbhDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMLdDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLdDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLdDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[500] * 值规则信息：内容长度必须小于等于[500]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMLdDefaultValidator") @Component("IMLdDefaultValidator")
public class IMLdDefaultValidator implements ConstraintValidator<IMLdDefault, String>,Validator { public class IMLdDefaultValidator implements ConstraintValidator<IMLdDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMLdidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLdidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMLdidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[500] * 值规则信息：内容长度必须小于等于[500]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMLdidsDefaultValidator") @Component("IMLdidsDefaultValidator")
public class IMLdidsDefaultValidator implements ConstraintValidator<IMLdidsDefault, String>,Validator { public class IMLdidsDefaultValidator implements ConstraintValidator<IMLdidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[500]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMNgrqDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgrqDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgrqDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMNgrqDefaultValidator") @Component("IMNgrqDefaultValidator")
public class IMNgrqDefaultValidator implements ConstraintValidator<IMNgrqDefault, Timestamp>,Validator { public class IMNgrqDefaultValidator implements ConstraintValidator<IMNgrqDefault, Timestamp>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMNgshDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgshDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgshDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMNgshDefaultValidator") @Component("IMNgshDefaultValidator")
public class IMNgshDefaultValidator implements ConstraintValidator<IMNgshDefault, String>,Validator { public class IMNgshDefaultValidator implements ConstraintValidator<IMNgshDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMNgshidsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgshidsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMNgshidsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMNgshidsDefaultValidator") @Component("IMNgshidsDefaultValidator")
public class IMNgshidsDefaultValidator implements ConstraintValidator<IMNgshidsDefault, String>,Validator { public class IMNgshidsDefaultValidator implements ConstraintValidator<IMNgshidsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMQttzyddxDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMQttzyddxDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMQttzyddxDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[1000] * 值规则信息：内容长度必须小于等于[1000]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMQttzyddxDefaultValidator") @Component("IMQttzyddxDefaultValidator")
public class IMQttzyddxDefaultValidator implements ConstraintValidator<IMQttzyddxDefault, String>,Validator { public class IMQttzyddxDefaultValidator implements ConstraintValidator<IMQttzyddxDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[1000]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMSblbDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSblbDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSblbDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMSblbDefaultValidator") @Component("IMSblbDefaultValidator")
public class IMSblbDefaultValidator implements ConstraintValidator<IMSblbDefault, String>,Validator { public class IMSblbDefaultValidator implements ConstraintValidator<IMSblbDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMSblxDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSblxDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSblxDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMSblxDefaultValidator") @Component("IMSblxDefaultValidator")
public class IMSblxDefaultValidator implements ConstraintValidator<IMSblxDefault, String>,Validator { public class IMSblxDefaultValidator implements ConstraintValidator<IMSblxDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMSdfsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSdfsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSdfsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMSdfsDefaultValidator") @Component("IMSdfsDefaultValidator")
public class IMSdfsDefaultValidator implements ConstraintValidator<IMSdfsDefault, String>,Validator { public class IMSdfsDefaultValidator implements ConstraintValidator<IMSdfsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMShfsDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMShfsDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMShfsDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMShfsDefaultValidator") @Component("IMShfsDefaultValidator")
public class IMShfsDefaultValidator implements ConstraintValidator<IMShfsDefault, String>,Validator { public class IMShfsDefaultValidator implements ConstraintValidator<IMShfsDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMSjbmDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSjbmDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMSjbmDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMSjbmDefaultValidator") @Component("IMSjbmDefaultValidator")
public class IMSjbmDefaultValidator implements ConstraintValidator<IMSjbmDefault, Integer>,Validator { public class IMSjbmDefaultValidator implements ConstraintValidator<IMSjbmDefault, Integer>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMTzydDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMTzydDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMTzydDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMTzydDefaultValidator") @Component("IMTzydDefaultValidator")
public class IMTzydDefaultValidator implements ConstraintValidator<IMTzydDefault, Integer>,Validator { public class IMTzydDefaultValidator implements ConstraintValidator<IMTzydDefault, Integer>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMTzydyyDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMTzydyyDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMTzydyyDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMTzydyyDefaultValidator") @Component("IMTzydyyDefaultValidator")
public class IMTzydyyDefaultValidator implements ConstraintValidator<IMTzydyyDefault, String>,Validator { public class IMTzydyyDefaultValidator implements ConstraintValidator<IMTzydyyDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMUpdateDateDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMUpdateDateDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMUpdateDateDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：默认规则 * 值规则信息：默认规则
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMUpdateDateDefaultValidator") @Component("IMUpdateDateDefaultValidator")
public class IMUpdateDateDefaultValidator implements ConstraintValidator<IMUpdateDateDefault, Timestamp>,Validator { public class IMUpdateDateDefaultValidator implements ConstraintValidator<IMUpdateDateDefault, Timestamp>,Validator {
private static final String MESSAGE = "值规则校验失败：【默认规则】"; private static final String MESSAGE = "值规则校验失败：【默认规则】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMUpdateManDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMUpdateManDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMUpdateManDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[60] * 值规则信息：内容长度必须小于等于[60]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMUpdateManDefaultValidator") @Component("IMUpdateManDefaultValidator")
public class IMUpdateManDefaultValidator implements ConstraintValidator<IMUpdateManDefault, String>,Validator { public class IMUpdateManDefaultValidator implements ConstraintValidator<IMUpdateManDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[60]】";
......
ps-core/src/main/java/com/ibiz/core/module2/valuerule/validator/im/IMWfinstanceidDefaultValidator.java
浏览文件 @ 58029906
package com.ibiz.core.module2.valuerule.validator.im; package com.ibiz.core.module2.valuerule.validator.im;
import lombok.extern.slf4j.Slf4j;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMWfinstanceidDefault;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -8,19 +19,6 @@ import java.math.BigInteger; ...@@ -8,19 +19,6 @@ import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import com.ibiz.util.valuerule.DefaultValueRule;
import com.ibiz.util.valuerule.VRCondition;
import com.ibiz.util.valuerule.condition.*;
import com.ibiz.core.module2.valuerule.anno.im.IMWfinstanceidDefault;
import com.ibiz.util.log.IBIZLog;
/** /**
* 值规则注解解析类 * 值规则注解解析类
...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog; ...@@ -30,7 +28,6 @@ import com.ibiz.util.log.IBIZLog;
* 值规则信息：内容长度必须小于等于[100] * 值规则信息：内容长度必须小于等于[100]
*/ */
@Slf4j @Slf4j
@IBIZLog
@Component("IMWfinstanceidDefaultValidator") @Component("IMWfinstanceidDefaultValidator")
public class IMWfinstanceidDefaultValidator implements ConstraintValidator<IMWfinstanceidDefault, String>,Validator { public class IMWfinstanceidDefaultValidator implements ConstraintValidator<IMWfinstanceidDefault, String>,Validator {
private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】"; private static final String MESSAGE = "值规则校验失败：【内容长度必须小于等于[100]】";
......
ps-dependencies/pom.xml
浏览文件 @ 58029906
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或