diff --git a/mdp-form-starter/README.md b/mdp-form-bootstrap/README.md
similarity index 100%
rename from mdp-form-starter/README.md
rename to mdp-form-bootstrap/README.md
diff --git a/mdp-form-starter/pom.xml b/mdp-form-bootstrap/pom.xml
similarity index 54%
rename from mdp-form-starter/pom.xml
rename to mdp-form-bootstrap/pom.xml
index 873b937..5e7641b 100644
--- a/mdp-form-starter/pom.xml
+++ b/mdp-form-bootstrap/pom.xml
@@ -2,38 +2,23 @@
4.0.0
- mdp-form-starter
+ mdp-form-bootstrap
jar
- mdp-form-starter 智能表单启动器
+ mdp-form-bootstrap 智能表单启动器
- com.qingqinkj.mdp
- mdp-form-server
+ com.mdp
+ mdp-form-backend
M.1.0.0-RELEASE
- org.springframework.boot
- spring-boot-starter-actuator
-
-
- org.springframework.boot
- spring-boot-starter-webflux
-
-
- org.springframework.cloud
- spring-cloud-starter-netflix-hystrix
-
-
- org.springframework.cloud
- spring-cloud-starter-contract-stub-runner
-
-
- org.springframework.cloud
- spring-cloud-starter-consul-discovery
+ com.mdp
+ mdp-cloud-starter
+ ${mdp.version}
- com.qingqinkj.mdp
+ com.mdp
mdp-form
diff --git a/mdp-form-bootstrap/src/main/java/com/mdp/FormApplication.java b/mdp-form-bootstrap/src/main/java/com/mdp/FormApplication.java
new file mode 100644
index 0000000..445735e
--- /dev/null
+++ b/mdp-form-bootstrap/src/main/java/com/mdp/FormApplication.java
@@ -0,0 +1,18 @@
+package com.mdp;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+
+@SpringCloudApplication
+@EnableRedisHttpSession
+//@EnableSwagger2
+public class FormApplication {
+
+
+ public static void main(String[] args) {
+ SpringApplication.run(FormApplication.class,args);
+
+ }
+}
diff --git a/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java b/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
new file mode 100644
index 0000000..24ab1dd
--- /dev/null
+++ b/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
@@ -0,0 +1,42 @@
+package com.mdp;
+
+import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+/**
+ * com.qqkj.WebSecurityConfig
+ *
+ * @author chenyc
+ * @date 2019/10/10
+ */
+@EnableWebSecurity
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+ @Autowired
+ MdpJwtAuthenticationConverter jwtConverter;
+
+
+ @Override
+ public void configure(WebSecurity web) throws Exception {
+ web.ignoring().antMatchers("/webjars/**");
+ }
+
+ /**
+ * 允许匿名访问所有接口 主要是 oauth 接口
+ * @param http
+ * @throws Exception
+ */
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+ http.authorizeRequests().mvcMatchers("/authorize","/authorized","/","/index","/oauth2/login/token","/oauth2/login/token/web").permitAll().and().oauth2Client().and().logout().disable();
+ http.formLogin().usernameParameter("userloginid");
+ http.oauth2Login();
+ http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter);
+ http.csrf().disable();
+ }
+
+}
diff --git a/mdp-form-starter/src/main/resources/application-123prod.properties b/mdp-form-bootstrap/src/main/resources/application-123prod.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/application-123prod.properties
rename to mdp-form-bootstrap/src/main/resources/application-123prod.properties
diff --git a/mdp-form-starter/src/main/resources/application-dev.properties b/mdp-form-bootstrap/src/main/resources/application-dev.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/application-dev.properties
rename to mdp-form-bootstrap/src/main/resources/application-dev.properties
diff --git a/mdp-form-starter/src/main/resources/application-m1prod.properties b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/application-m1prod.properties
rename to mdp-form-bootstrap/src/main/resources/application-m1prod.properties
diff --git a/mdp-form-starter/src/main/resources/application-prod.properties b/mdp-form-bootstrap/src/main/resources/application-prod.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/application-prod.properties
rename to mdp-form-bootstrap/src/main/resources/application-prod.properties
diff --git a/mdp-form-starter/src/main/resources/application.properties b/mdp-form-bootstrap/src/main/resources/application.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/application.properties
rename to mdp-form-bootstrap/src/main/resources/application.properties
diff --git a/mdp-form-starter/src/main/resources/locale/message_zh.properties b/mdp-form-bootstrap/src/main/resources/locale/message_zh.properties
similarity index 100%
rename from mdp-form-starter/src/main/resources/locale/message_zh.properties
rename to mdp-form-bootstrap/src/main/resources/locale/message_zh.properties
diff --git a/mdp-form-starter/src/main/resources/logback-spring.xml b/mdp-form-bootstrap/src/main/resources/logback-spring.xml
similarity index 100%
rename from mdp-form-starter/src/main/resources/logback-spring.xml
rename to mdp-form-bootstrap/src/main/resources/logback-spring.xml
diff --git a/mdp-form-starter/src/main/resources/mybatis/mybatis-config.xml b/mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml
similarity index 94%
rename from mdp-form-starter/src/main/resources/mybatis/mybatis-config.xml
rename to mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml
index 9a681c2..8c92d0f 100644
--- a/mdp-form-starter/src/main/resources/mybatis/mybatis-config.xml
+++ b/mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml
@@ -15,7 +15,7 @@
-
+
@@ -45,6 +45,6 @@
-
+
\ No newline at end of file
diff --git a/mdp-form-starter/src/main/resources/stencilset_bpmn.json b/mdp-form-bootstrap/src/main/resources/stencilset_bpmn.json
similarity index 100%
rename from mdp-form-starter/src/main/resources/stencilset_bpmn.json
rename to mdp-form-bootstrap/src/main/resources/stencilset_bpmn.json
diff --git a/mdp-form-starter/src/main/webapp/META-INF/MANIFEST.MF b/mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from mdp-form-starter/src/main/webapp/META-INF/MANIFEST.MF
rename to mdp-form-bootstrap/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/mdp-form-starter/src/main/webapp/WEB-INF/web.xml b/mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from mdp-form-starter/src/main/webapp/WEB-INF/web.xml
rename to mdp-form-bootstrap/src/main/webapp/WEB-INF/web.xml
diff --git a/mdp-form-starter/src/main/java/com/qqkj/mdp/FormApplication.java b/mdp-form-starter/src/main/java/com/qqkj/mdp/FormApplication.java
deleted file mode 100644
index 9a3c13e..0000000
--- a/mdp-form-starter/src/main/java/com/qqkj/mdp/FormApplication.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.qqkj.mdp;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-import org.springframework.web.client.RestTemplate;
-
-import com.qqkj.mdp.core.entity.AppAuth;
-import com.qqkj.mdp.safe.common.rest.MdpRestTemplate;
-
-@SpringCloudApplication
-@EnableRedisHttpSession
-//@EnableSwagger2
-public class FormApplication {
-
-
- public static void main(String[] args) {
- SpringApplication.run(FormApplication.class,args);
-
- }
- @Bean
- @LoadBalanced
- public RestTemplate restTemplate ()
- {
- SimpleClientHttpRequestFactory simpleClientHttpRequestFactory = new SimpleClientHttpRequestFactory ();
- simpleClientHttpRequestFactory.setConnectTimeout(20000);
- simpleClientHttpRequestFactory.setReadTimeout(20000);
- return new RestTemplate(simpleClientHttpRequestFactory);
- }
- @Bean
- @Autowired
- public MdpRestTemplate mdpRestTemplate(RestTemplate restTemplate,AppAuth appAuth) {
- return new MdpRestTemplate(restTemplate, appAuth);
-
- }
-}
diff --git a/mdp-form-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java b/mdp-form-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java
deleted file mode 100644
index 1e1758e..0000000
--- a/mdp-form-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.qqkj.mdp;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-
-
-@Configuration
-public class MdpWebAppConfigurer
- extends WebMvcConfigurerAdapter {
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- // 多个拦截器组成一个拦截器链
- // addPathPatterns 用于添加拦截规则
- // excludePathPatterns 用户排除拦截
-
- super.addInterceptors(registry);
- }
-
-}
\ No newline at end of file
diff --git a/mdp-form-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java b/mdp-form-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java
deleted file mode 100644
index 4067cd0..0000000
--- a/mdp-form-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.qqkj.mdp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.AccessDecisionManager;
-import org.springframework.security.access.AccessDecisionVoter;
-import org.springframework.security.access.vote.AffirmativeBased;
-import org.springframework.security.access.vote.AuthenticatedVoter;
-import org.springframework.security.access.vote.RoleVoter;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.password.StandardPasswordEncoder;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.security.web.access.AccessDeniedHandler;
-import org.springframework.security.web.access.channel.ChannelProcessingFilter;
-import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
-import org.springframework.security.web.access.expression.WebExpressionVoter;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
-import org.springframework.web.cors.CorsUtils;
-
-import com.qqkj.mdp.core.log.MdpLogFilter;
-import com.qqkj.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint;
-import com.qqkj.mdp.safe.common.expression.DbPermissionEvaluator;
-import com.qqkj.mdp.safe.common.filter.MdpApiAuthorizationFilter;
-import com.qqkj.mdp.safe.common.filter.MdpUserAuthenticationFilter;
-import com.qqkj.mdp.safe.common.filter.MdpUserAuthorizationFilter;
-import com.qqkj.mdp.safe.common.handle.SafeAccessDeniedHandler;
-import com.qqkj.mdp.safe.common.handle.SafeAuthenticationFailureHandler;
-import com.qqkj.mdp.safe.common.handle.SafeAuthenticationSuccessHandler;
-import com.qqkj.mdp.safe.common.pwd.SafePasswordEncoder;
-import com.qqkj.mdp.safe.common.service.SafeUserService;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-
-
- @Autowired
- SafeUserService userService;
-
-
- @Override
- public void configure(WebSecurity web) throws Exception {
- web.ignoring().antMatchers("/**/*.ttf","/**/*.woff","/**/*.woff2","/**/*.eot","/**/*.css","/**/*.js","/**/*.gif","/**/*.png","/**/*.jpg","/**/*.ico","/**/*.html","/**/*.HTML","/**/*.htm","/**/*.js.map","/**/*.jsp","/error");
- }
-
- @Override
- protected void configure(HttpSecurity http) throws Exception {
-
- http.authorizeRequests().accessDecisionManager(accessDecisionManager()).expressionHandler(webSecurityExpressionHandler())
- .antMatchers("/actuator/**","/**/common/login","/**/common/user/reg/web","/","/index.html","/login",
- "/error","/","/index","/**/safe/app/auth**",
- "/**/sys/user/addUserNoAuth",
- "/**/sys/branch/listBranchNoAuth",
- "/**/sys/branch/addBranchNoAuth",
- "/**/sys/dept/listDeptAndChidlDeptByBranchIdNoAuth",
- "/**/sys/dept/addDeptNoAuth",
- "/**/sys/userDept/batchEditNoauth").permitAll()
-
- .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
- .anyRequest().authenticated().and()
- //.addFilterAfter(wxpubLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and()
- //.antMatcher(wxaAuthorizePattern).addFilterAfter(wxaLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and()
- .addFilterBefore(new MdpLogFilter(), ChannelProcessingFilter.class)
- .addFilterBefore(userAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
- .addFilterAt(userAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class)
- .addFilterAfter(apiAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class)
- .formLogin().disable()
- .logout().logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler())
- .and().csrf().disable().httpBasic().disable().exceptionHandling().and().exceptionHandling().accessDeniedHandler(accessDeniedHandler()).authenticationEntryPoint(safeAuthenticationEntryPoint())
- ;
- }
- @Bean
- public AuthenticationEntryPoint safeAuthenticationEntryPoint() {
- // TODO Auto-generated method stub
- return new SafeAuthenticationEntryPoint();
- }
-
- @Bean
- public AccessDeniedHandler accessDeniedHandler() {
- // TODO Auto-generated method stub
- return new SafeAccessDeniedHandler();
- }
-
- @Bean
- public AuthenticationFailureHandler authenticationFailureHandler() {
- // TODO Auto-generated method stub
- return new SafeAuthenticationFailureHandler();
- }
- @Bean
- public AuthenticationSuccessHandler successHandler() {
- // TODO Auto-generated method stub
- return new SafeAuthenticationSuccessHandler();
- }
- @Bean
- @Override
- public AuthenticationManager authenticationManagerBean() throws Exception {
- return super.authenticationManagerBean();
- }
- @Bean
- public MdpUserAuthenticationFilter userAuthenticationFilter() throws Exception{
- MdpUserAuthenticationFilter f=new MdpUserAuthenticationFilter();
-
- f.setAuthenticationManager(authenticationManagerBean());
- f.setFilterProcessesUrl("/**/common/login");
- f.setAuthenticationSuccessHandler(successHandler());
- f.setUsernameParameter("displayUserid");
- f.setAuthenticationFailureHandler(authenticationFailureHandler());
-
- return f;
-
- }
- @Bean
- public MdpUserAuthorizationFilter userAuthorizationFilter() throws Exception{
- MdpUserAuthorizationFilter f=new MdpUserAuthorizationFilter(authenticationManagerBean());
- return f;
-
- }
- @Bean
- public MdpApiAuthorizationFilter apiAuthorizationFilter() throws Exception{
- MdpApiAuthorizationFilter f=new MdpApiAuthorizationFilter(authenticationManagerBean());
- return f;
-
- }
- @Autowired
- public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
- auth.userDetailsService(userService).passwordEncoder(new SafePasswordEncoder());
- }
- /*
- *
- * 这里可以增加自定义的投票器
- */
- @SuppressWarnings("rawtypes")
- @Bean(name = "accessDecisionManager")
- public AccessDecisionManager accessDecisionManager() {
- List> decisionVoters = new ArrayList<>();
- decisionVoters.add(new RoleVoter());
- decisionVoters.add(new AuthenticatedVoter());
- decisionVoters.add(webExpressionVoter());// 启用表达式投票器
-
- AffirmativeBased accessDecisionManager = new AffirmativeBased(decisionVoters);
-
- return accessDecisionManager;
- }
-
- /*
- * 表达式控制器
- */
- @Bean(name = "expressionHandler")
- public DefaultWebSecurityExpressionHandler webSecurityExpressionHandler() {
- DefaultWebSecurityExpressionHandler webSecurityExpressionHandler = new DefaultWebSecurityExpressionHandler();
- webSecurityExpressionHandler.setPermissionEvaluator(new DbPermissionEvaluator());
- return webSecurityExpressionHandler;
- }
-
- /*
- * 表达式投票器
- */
- @Bean(name = "expressionVoter")
- public WebExpressionVoter webExpressionVoter() {
- WebExpressionVoter webExpressionVoter = new WebExpressionVoter();
- webExpressionVoter.setExpressionHandler(webSecurityExpressionHandler());
- return webExpressionVoter;
- }
-
-}
\ No newline at end of file
diff --git a/mdp-form/pom.xml b/mdp-form/pom.xml
index 8ab0b42..2c368fe 100644
--- a/mdp-form/pom.xml
+++ b/mdp-form/pom.xml
@@ -8,10 +8,15 @@
mdp-form 表单管理系统
表单管理系统
- com.qingqinkj.mdp
- mdp-form-server
+ com.mdp
+ mdp-form-backend
M.1.0.0-RELEASE
+
+ com.mdp
+ mdp-oauth2-client
+ ${mdp.version}
+
\ No newline at end of file
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/FormUtil.java b/mdp-form/src/main/java/com/mdp/form/FormUtil.java
similarity index 96%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/FormUtil.java
rename to mdp-form/src/main/java/com/mdp/form/FormUtil.java
index 41ca67f..2731ccf 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/FormUtil.java
+++ b/mdp-form/src/main/java/com/mdp/form/FormUtil.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form;
+package com.mdp.form;
public class FormUtil {
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java
similarity index 92%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java
index 7cb5bb4..e0117e7 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java
@@ -1,41 +1,38 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.qqkj.mdp.core.context.ContextHolder;
+
+import com.mdp.form.entity.FormData;
+import com.mdp.form.entity.FormDataVo;
+import com.mdp.form.service.FormDataService;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import com.qqkj.mdp.mybatis.PageUtils;
-import com.qqkj.mdp.safe.common.entity.User;
-import com.qqkj.mdp.safe.common.utils.LoginUtils;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormDataService;
-import com.qqkj.mdp.form.entity.FormData;
-import com.qqkj.mdp.form.entity.FormDataVo;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.safe.client.entity.User;
+import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+
/**
* url编制采用rest风格,如对FORM.form_data form_data的操作有增删改查,对应的url分别为:
* 新增: form/formData/add
@@ -101,7 +98,7 @@ public class FormDataController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
- @ApiResponse(code = 200,response=FormData.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+ @ApiResponse(code = 200,response= FormData.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map listFormData( @RequestParam Map formData){
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataProcessApprovaController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataProcessApprovaController.java
similarity index 90%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataProcessApprovaController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormDataProcessApprovaController.java
index 1767368..e77222e 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataProcessApprovaController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataProcessApprovaController.java
@@ -1,37 +1,31 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.qqkj.mdp.core.context.ContextHolder;
+
+import com.mdp.form.entity.FormDataProcessApprova;
+import com.mdp.form.service.FormDataProcessApprovaService;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import com.qqkj.mdp.mybatis.PageUtils;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormDataProcessApprovaService;
-import com.qqkj.mdp.form.entity.FormDataProcessApprova;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.entity.Tips;
+
/**
* url编制采用rest风格,如对FORM.form_data_process_approva form_data_process_approva的操作有增删改查,对应的url分别为:
* 新增: form/formDataProcessApprova/add
@@ -85,7 +79,7 @@ public class FormDataProcessApprovaController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
- @ApiResponse(code = 200,response=FormDataProcessApprova.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+ @ApiResponse(code = 200,response= FormDataProcessApprova.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map listFormDataProcessApprova( @RequestParam Map formDataProcessApprova){
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataTagController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java
similarity index 95%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataTagController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java
index c3a8ff2..f1a2694 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDataTagController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java
@@ -1,9 +1,12 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.mdp.form.entity.FormDataTagVo;
+import com.mdp.form.service.FormDataService;
+import com.mdp.form.service.FormDataTagService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,14 +16,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.form.entity.FormDataTag;
-import com.qqkj.mdp.form.entity.FormDataTagVo;
-import com.qqkj.mdp.form.service.FormDataService;
-import com.qqkj.mdp.form.service.FormDataTagService;
-import com.qqkj.mdp.mybatis.PageUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.form.entity.FormDataTag;
+import com.mdp.mybatis.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java
similarity index 89%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java
index 0bb1ffa..ca40a68 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java
@@ -1,40 +1,34 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.qqkj.mdp.core.context.ContextHolder;
+
+import com.mdp.form.entity.FormDef;
+import com.mdp.form.service.FormDataService;
+import com.mdp.form.service.FormDefService;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import com.qqkj.mdp.mybatis.PageUtils;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormDataService;
-import com.qqkj.mdp.form.service.FormDefService;
-import com.qqkj.mdp.form.entity.FormDef;
-import com.qqkj.mdp.form.entity.FormDefVo;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+import com.mdp.form.entity.FormDefVo;
/**
* url编制采用rest风格,如对FORM.form_def form_def的操作有增删改查,对应的url分别为:
* 新增: form/formDef/add
@@ -84,7 +78,7 @@ public class FormDefController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
- @ApiResponse(code = 200,response=FormDef.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+ @ApiResponse(code = 200,response= FormDef.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map listFormDef( @RequestParam Map formDef){
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefTagController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefTagController.java
similarity index 93%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefTagController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormDefTagController.java
index e059915..9ff48e2 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormDefTagController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefTagController.java
@@ -1,9 +1,13 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.mdp.form.entity.FormDefTag;
+import com.mdp.form.entity.FormDefTagVo;
+import com.mdp.form.service.FormDefService;
+import com.mdp.form.service.FormDefTagService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,14 +17,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.form.entity.FormDefTag;
-import com.qqkj.mdp.form.entity.FormDefTagVo;
-import com.qqkj.mdp.form.service.FormDefService;
-import com.qqkj.mdp.form.service.FormDefTagService;
-import com.qqkj.mdp.mybatis.PageUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.mybatis.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -67,7 +67,7 @@ public class FormDefTagController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
- @ApiResponse(code = 200,response=FormDefTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+ @ApiResponse(code = 200,response= FormDefTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map listFormDefTag( @RequestParam Map formDefTag){
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormFieldController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormFieldController.java
similarity index 89%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormFieldController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormFieldController.java
index c018d5b..683f4b7 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormFieldController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormFieldController.java
@@ -1,38 +1,33 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.qqkj.mdp.core.context.ContextHolder;
+
+import com.mdp.form.entity.FormField;
+import com.mdp.form.service.FormFieldCacheService;
+import com.mdp.form.service.FormFieldService;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import com.qqkj.mdp.mybatis.PageUtils;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormFieldCacheService;
-import com.qqkj.mdp.form.service.FormFieldService;
-import com.qqkj.mdp.form.entity.FormField;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+
/**
* url编制采用rest风格,如对FORM.form_field form_field的操作有增删改查,对应的url分别为:
* 新增: form/formField/add
@@ -55,7 +50,7 @@ public class FormFieldController {
private FormFieldService formFieldService;
@Autowired
- FormFieldCacheService formFieldCacheService;
+ FormFieldCacheService formFieldCacheService;
@@ -87,7 +82,7 @@ public class FormFieldController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
- @ApiResponse(code = 200,response=FormField.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+ @ApiResponse(code = 200,response= FormField.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map listFormField( @RequestParam Map formField){
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormQxController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormQxController.java
similarity index 93%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormQxController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormQxController.java
index ac0690b..7aad433 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormQxController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormQxController.java
@@ -1,38 +1,35 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.qqkj.mdp.core.context.ContextHolder;
+
+import com.mdp.form.service.FormQxCacheService;
+import com.mdp.form.service.FormQxService;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import com.qqkj.mdp.mybatis.PageUtils;
-import com.qqkj.mdp.core.utils.RequestUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormQxCacheService;
-import com.qqkj.mdp.form.service.FormQxService;
-import com.qqkj.mdp.form.entity.FormQx;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+import com.mdp.form.entity.FormQx;
/**
* url编制采用rest风格,如对FORM.form_qx form_qx的操作有增删改查,对应的url分别为:
* 新增: form/formQx/add
@@ -55,7 +52,7 @@ public class FormQxController {
private FormQxService formQxService;
@Autowired
- FormQxCacheService formQxCacheService;
+ FormQxCacheService formQxCacheService;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormViewController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormViewController.java
similarity index 95%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormViewController.java
rename to mdp-form/src/main/java/com/mdp/form/ctrl/FormViewController.java
index 525ebbe..c6f2466 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/ctrl/FormViewController.java
+++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormViewController.java
@@ -1,9 +1,10 @@
-package com.qqkj.mdp.form.ctrl;
+package com.mdp.form.ctrl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.mdp.form.service.FormViewService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,10 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.service.SequenceService;
-import com.qqkj.mdp.form.service.FormViewService;
-import com.qqkj.mdp.mybatis.PageUtils;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.service.SequenceService;
+import com.mdp.mybatis.PageUtils;
/**
* url编制采用rest风格,如对FORM.form_view的操作有增删改查,对应的url分别为:
* 新增: form/formView/add
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormData.java b/mdp-form/src/main/java/com/mdp/form/entity/FormData.java
similarity index 99%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormData.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormData.java
index 1a9308a..c7fdda3 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormData.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormData.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataProcessApprova.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
similarity index 99%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataProcessApprova.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
index bd3f436..4946ac3 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataProcessApprova.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTag.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
similarity index 98%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTag.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
index 0b74f23..7437de4 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTag.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTagVo.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTagVo.java
similarity index 93%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTagVo.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDataTagVo.java
index 22f1ccf..aafd00d 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataTagVo.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTagVo.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import java.util.List;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataVo.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataVo.java
similarity index 86%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataVo.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDataVo.java
index 35fd6f6..f6f94ab 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDataVo.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataVo.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
public class FormDataVo extends FormData {
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDef.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java
similarity index 99%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDef.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDef.java
index 4b4560e..6711a54 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDef.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTag.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
similarity index 98%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTag.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
index 09f9c52..9f15d72 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTag.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTagVo.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTagVo.java
similarity index 90%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTagVo.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDefTagVo.java
index a7c780c..0eb394b 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefTagVo.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTagVo.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import java.util.List;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefVo.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
similarity index 92%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefVo.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
index 3b1a544..a03fee0 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormDefVo.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import java.util.List;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormField.java b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java
similarity index 99%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormField.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormField.java
index 3780e42..1d672f1 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormField.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormQx.java b/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java
similarity index 99%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormQx.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormQx.java
index ed4ca47..a8915fa 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormQx.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormView.java b/mdp-form/src/main/java/com/mdp/form/entity/FormView.java
similarity index 97%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormView.java
rename to mdp-form/src/main/java/com/mdp/form/entity/FormView.java
index 838dc79..386c86f 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/entity/FormView.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormView.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.entity;
+package com.mdp.form.entity;
/**
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataProcessApprovaService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataProcessApprovaService.java
similarity index 74%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataProcessApprovaService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormDataProcessApprovaService.java
index b9a28b2..eebcc4b 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataProcessApprovaService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataProcessApprovaService.java
@@ -1,10 +1,8 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
-import java.util.List;
-import java.util.Map;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormDataProcessApprova;
+import com.mdp.core.service.BaseService;
+
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
similarity index 96%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
index 30f2ed1..ef3706c 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
import java.util.ArrayList;
import java.util.Date;
@@ -10,15 +10,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.core.utils.BaseUtils;
-import com.qqkj.mdp.form.FormUtil;
-import com.qqkj.mdp.form.entity.FormData;
-import com.qqkj.mdp.form.entity.FormDataProcessApprova;
-import com.qqkj.mdp.form.entity.FormDataVo;
-import com.qqkj.mdp.form.entity.FormField;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.err.BizException;
+import com.mdp.core.service.BaseService;
+import com.mdp.core.utils.BaseUtils;
+import com.mdp.form.FormUtil;
+import com.mdp.form.entity.FormData;
+import com.mdp.form.entity.FormDataProcessApprova;
+import com.mdp.form.entity.FormDataVo;
+import com.mdp.form.entity.FormField;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataTagService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataTagService.java
similarity index 94%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataTagService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormDataTagService.java
index ef7b9a0..015891c 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDataTagService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataTagService.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
import java.util.ArrayList;
import java.util.Date;
@@ -7,9 +7,9 @@ import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormDataTag;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.service.BaseService;
+import com.mdp.form.entity.FormDataTag;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
similarity index 90%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
index 4d6c614..6da5dc3 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
@@ -1,6 +1,5 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -11,15 +10,13 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.core.utils.NumberUtil;
-import com.qqkj.mdp.form.entity.FormDef;
-import com.qqkj.mdp.form.entity.FormDefVo;
-import com.qqkj.mdp.form.entity.FormField;
-import com.qqkj.mdp.safe.common.entity.User;
-import com.qqkj.mdp.safe.common.utils.LoginUtils;
+import com.mdp.core.err.BizException;
+import com.mdp.core.service.BaseService;
+import com.mdp.form.entity.FormDef;
+import com.mdp.form.entity.FormDefVo;
+import com.mdp.form.entity.FormField;
+import com.mdp.safe.client.entity.User;
+import com.mdp.safe.client.utils.LoginUtils;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefTagService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefTagService.java
similarity index 94%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefTagService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormDefTagService.java
index 79ae8b7..85334bb 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormDefTagService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefTagService.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
import java.util.ArrayList;
import java.util.Date;
@@ -9,9 +9,9 @@ import java.util.Map;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import com.qqkj.mdp.core.entity.Tips;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormDefTag;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.service.BaseService;
+import com.mdp.form.entity.FormDefTag;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldCacheService.java b/mdp-form/src/main/java/com/mdp/form/service/FormFieldCacheService.java
similarity index 90%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldCacheService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormFieldCacheService.java
index a8a5f14..4431c44 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldCacheService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormFieldCacheService.java
@@ -1,4 +1,4 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.form.entity.FormField;
+import com.mdp.form.entity.FormField;
@Service
public class FormFieldCacheService {
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldService.java b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
similarity index 85%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
index 600e441..60b2f48 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormFieldService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
@@ -1,14 +1,12 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
import java.util.List;
-import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.core.err.BizException;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormField;
+import com.mdp.core.service.BaseService;
+import com.mdp.form.entity.FormField;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxCacheService.java b/mdp-form/src/main/java/com/mdp/form/service/FormQxCacheService.java
similarity index 81%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxCacheService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormQxCacheService.java
index c661c43..060e2dd 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxCacheService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormQxCacheService.java
@@ -1,14 +1,12 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.form.entity.FormField;
-import com.qqkj.mdp.form.entity.FormQx;
+import com.mdp.form.entity.FormQx;
@Service
public class FormQxCacheService {
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxService.java b/mdp-form/src/main/java/com/mdp/form/service/FormQxService.java
similarity index 73%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormQxService.java
index 828d43b..db87673 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormQxService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormQxService.java
@@ -1,10 +1,8 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
-import java.util.List;
-import java.util.Map;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormQx;
+import com.mdp.core.service.BaseService;
+
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormViewService.java b/mdp-form/src/main/java/com/mdp/form/service/FormViewService.java
similarity index 73%
rename from mdp-form/src/main/java/com/qqkj/mdp/form/service/FormViewService.java
rename to mdp-form/src/main/java/com/mdp/form/service/FormViewService.java
index 65e2d64..6335566 100644
--- a/mdp-form/src/main/java/com/qqkj/mdp/form/service/FormViewService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormViewService.java
@@ -1,10 +1,8 @@
-package com.qqkj.mdp.form.service;
+package com.mdp.form.service;
-import java.util.List;
-import java.util.Map;
import org.springframework.stereotype.Service;
-import com.qqkj.mdp.core.service.BaseService;
-import com.qqkj.mdp.form.entity.FormView;
+import com.mdp.core.service.BaseService;
+
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
index 42f45dd..6ef8e37 100644
--- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
+++ b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
@@ -1,13 +1,13 @@
-
+
-
-