From a27752c0b3cd448df29d39ad02de8c981036ae64 Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Tue, 13 Mar 2018 22:27:29 +0800 Subject: [PATCH] add file api --- server/crm/pom.xml | 4 + .../crm/controller/ApplicationController.java | 114 ++++++++++++++++++ .../crm/controller/FileController.java | 53 ++++++++ .../crm/service/ApplicationService.java | 24 ++++ .../support/ApplicationServiceSupport.java | 85 +++++++++++++ .../main/resources/application_dev.properties | 4 + .../src/main/resources/shiro/auth.properties | 1 + .../crm/service/DiskFileStoreTest.java | 33 +++++ server/file-api/pom.xml | 5 + .../file/support/AbstractAmbitionFileApi.java | 5 +- .../pudonghot/ambition/file/DiskFileApi.java | 9 ++ .../ambition/file/disk/DiskFileSupport.java | 21 ++-- .../crm/mapper/ApplicationImageMapper.java | 13 ++ .../crm/mapper/ApplicationImageMapper.xml | 13 ++ .../crm/mapper/ApplicationMapper.java | 13 ++ .../ambition/crm/mapper/ApplicationMapper.xml | 13 ++ .../form/create/ApplicationFormForCreate.java | 23 ++++ .../form/update/ApplicationFormForUpdate.java | 24 ++++ .../ambition/crm/model/Application.java | 28 +++++ .../ambition/crm/model/ApplicationImage.java | 26 ++++ 20 files changed, 498 insertions(+), 13 deletions(-) create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/controller/ApplicationController.java create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/service/ApplicationService.java create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java create mode 100644 server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java create mode 100644 server/file-disk/src/main/java/com/pudonghot/ambition/file/DiskFileApi.java create mode 100644 server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.java create mode 100644 server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.xml create mode 100644 server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.java create mode 100644 server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.xml create mode 100644 server/model/src/main/java/com/pudonghot/ambition/crm/form/create/ApplicationFormForCreate.java create mode 100644 server/model/src/main/java/com/pudonghot/ambition/crm/form/update/ApplicationFormForUpdate.java create mode 100644 server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java create mode 100644 server/model/src/main/java/com/pudonghot/ambition/crm/model/ApplicationImage.java diff --git a/server/crm/pom.xml b/server/crm/pom.xml index 31ef1ad..027e235 100644 --- a/server/crm/pom.xml +++ b/server/crm/pom.xml @@ -25,6 +25,10 @@ com.pudonghot.ambition util + + com.pudonghot.ambition + file-disk + com.pudonghot.ambition crm-mapper diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/ApplicationController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/ApplicationController.java new file mode 100644 index 0000000..73059f9 --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/ApplicationController.java @@ -0,0 +1,114 @@ +package com.pudonghot.ambition.crm.controller; + +import javax.validation.Valid; +import me.chyxion.tigon.mybatis.Search; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import me.chyxion.tigon.model.ViewModel; +import me.chyxion.tigon.model.ListResult; +import org.apache.commons.lang3.StringUtils; +import com.pudonghot.ambition.crm.model.User; +import org.springframework.stereotype.Controller; +import com.pudonghot.ambition.crm.model.Application; +import org.springframework.web.multipart.MultipartFile; +import org.apache.shiro.authz.annotation.RequiresRoles; +import com.pudonghot.ambition.crm.model.CustomerProperty; +import org.springframework.web.bind.annotation.RequestParam; +import com.pudonghot.ambition.crm.service.ApplicationService; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestMapping; +import com.pudonghot.ambition.crm.form.create.ApplicationFormForCreate; +import com.pudonghot.ambition.crm.form.update.ApplicationFormForUpdate; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Jun 23, 2017 21:39:49 + */ +@Controller +@RequestMapping("/application") +public class ApplicationController + extends BaseQueryController { + + @RequestMapping("/list") + public ListResult> list( + @Min(0) + @RequestParam(value = "start", defaultValue = "0") + final int start, + @Min(1) + @Max(2048) + @RequestParam(value = "limit", defaultValue = "16") + final int limit, + @RequestParam(value = "search", required = false) + final String strSearch) { + + final Search search = new Search().asc(Application.NAME); + final User user = getAuthUser().getUser().getData(); + + if (!user.isAdmin()) { + search.eq(Application.OWNER, user.getId()); + } + + return listViewModels(search, start, limit, strSearch, null); + } + + @RequestMapping("/list-for-select") + public ListResult> listForSelect( + @RequestParam(value = "enabled", required = false) + final String enabled, + @RequestParam(value = "search", required = false) + final String strSearch) { + + final Search search = new Search().asc(CustomerProperty.NAME); + + if (StringUtils.isNotBlank(enabled)) { + search.eq(CustomerProperty.ENABLED, Boolean.parseBoolean(enabled)); + } + return listViewModels(search, null, null, strSearch, null); + } + + @RequiresRoles(User.ROLE_ADMIN) + @RequestMapping(value = "/create", method = RequestMethod.POST) + public void create( + @Valid ApplicationFormForCreate form) { + ((ApplicationService) queryService).create(form, null); + } + + @RequiresRoles(User.ROLE_ADMIN) + @RequestMapping(value = "/create-with-images", method = RequestMethod.POST) + public void create( + @Valid + ApplicationFormForCreate form, + @RequestParam("images") + MultipartFile[] images) { + + ((ApplicationService) queryService).create(form, images); + } + + @RequiresRoles(User.ROLE_ADMIN) + @RequestMapping(value = "/update", method = RequestMethod.POST) + public void update( + @Valid ApplicationFormForUpdate form) { + ((ApplicationService) queryService).update(form, null); + } + + @RequiresRoles(User.ROLE_ADMIN) + @RequestMapping(value = "/update-with-images", method = RequestMethod.POST) + public void update( + @Valid ApplicationFormForUpdate form, + @RequestParam("images") + MultipartFile[] images) { + ((ApplicationService) queryService).update(form, images); + } + + /** + * {@inheritDoc} + */ + @Override + protected String[] searchCols() { + return new String[] { + CustomerProperty.NAME, + CustomerProperty.NOTE + }; + } +} diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java new file mode 100644 index 0000000..d136fa0 --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java @@ -0,0 +1,53 @@ +package com.pudonghot.ambition.crm.controller; + +import java.io.File; +import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; +import org.springframework.util.Assert; +import me.chyxion.tigon.webmvc.ResourceModel; +import javax.servlet.http.HttpServletRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import com.pudonghot.ambition.crm.model.FileInfo; +import com.pudonghot.ambition.file.AmbitionFileApi; +import com.pudonghot.ambition.crm.mapper.FileInfoMapper; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @version 0.0.1 + * @since 0.0.1 + * @author Auto Generated
+ * Tech Support Shaun Chyxion
+ * Sep 14, 2016 3:53:04 PM + */ +@Slf4j +@Controller +public class FileController { + @Autowired + private FileInfoMapper fileInfoMapper; + @Autowired + private AmbitionFileApi fileApi; + + @RequestMapping("/f/**") + public Object file(HttpServletRequest request) { + String reqUri = request.getRequestURI(); + Assert.state(reqUri.length() > 3, "File name could not be blank"); + String fileName = reqUri.substring((request.getContextPath() + "/f/").length()); + + log.info("Get file [{}].", fileName); + final FileInfo fileInfo = fileInfoMapper.find(new Search(FileInfo.NAME, + fileName.replaceAll("\\.\\w+$", ""))); + ResourceModel rm = null; + if (fileInfo != null) { + File file = fileApi.getFile(fileName); + if (file.exists()) { + rm = new ResourceModel(file, + fileInfo.getContentType(), null); + rm.setName(fileInfo.getDownloadName()); + } + } + return rm != null ? + rm : ResponseEntity.notFound().build(); + } +} diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ApplicationService.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ApplicationService.java new file mode 100644 index 0000000..74179b1 --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ApplicationService.java @@ -0,0 +1,24 @@ +package com.pudonghot.ambition.crm.service; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +import com.pudonghot.ambition.crm.form.update.ApplicationFormForUpdate; +import me.chyxion.tigon.service.BaseCrudService; +import com.pudonghot.ambition.crm.model.Application; +import org.springframework.web.multipart.MultipartFile; +import com.pudonghot.ambition.crm.form.create.ApplicationFormForCreate; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Jun 23, 2017 21:35:24 + */ +public interface ApplicationService + extends BaseCrudService { + + void create(@NotNull @Valid ApplicationFormForCreate form, MultipartFile[] images); + + void update(@NotNull @Valid ApplicationFormForUpdate form, MultipartFile[] images); +} + diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java new file mode 100644 index 0000000..9d6cd4a --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java @@ -0,0 +1,85 @@ +package com.pudonghot.ambition.crm.service.support; + +import java.util.Date; +import java.io.IOException; +import java.io.InputStream; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.pudonghot.ambition.file.AmbitionFileApi; +import com.pudonghot.ambition.crm.model.Application; +import org.springframework.web.multipart.MultipartFile; +import com.pudonghot.ambition.crm.model.ApplicationImage; +import com.pudonghot.ambition.crm.mapper.ApplicationMapper; +import com.pudonghot.ambition.crm.service.ApplicationService; +import org.springframework.beans.factory.annotation.Autowired; +import me.chyxion.tigon.service.support.BaseCrudServiceSupport; +import com.pudonghot.ambition.crm.mapper.ApplicationImageMapper; +import com.pudonghot.ambition.crm.form.update.ApplicationFormForUpdate; +import com.pudonghot.ambition.crm.form.create.ApplicationFormForCreate; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Jun 23, 2017 21:36:31 + */ +@Slf4j +@Service +public class ApplicationServiceSupport + extends BaseCrudServiceSupport + implements ApplicationService { + + @Autowired + private ApplicationImageMapper imageMapper; + @Autowired + private AmbitionFileApi fileApi; + + /** + * {@inheritDoc} + */ + @Override + public void create(final ApplicationFormForCreate form, final MultipartFile[] images) { + final String id = idSeq.get(); + final Application application = form.copy(new Application()); + application.setId(id); + final Date now = new Date(); + application.setDateUpdated(now); + + if (images != null) { + final String createdBy = form.getCreatedBy(); + int sort = 0; + final String imageFolder = imageFolder(id); + for (final MultipartFile image : images) { + if (!image.isEmpty()) { + try (final InputStream ins = image.getInputStream()) { + final String imageId = idSeq.get(); + fileApi.uploadImage(ins, imageFolder, imageId); + final ApplicationImage appImage = new ApplicationImage(); + appImage.setId(imageId); + appImage.setApplicationId(id); + appImage.setSort(sort++); + appImage.setCreatedBy(createdBy); + appImage.setDateCreated(now); + imageMapper.insert(appImage); + } + catch (IOException e) { + throw new IllegalStateException( + "Read upload image [" + image.getOriginalFilename() + "] error cased", e); + } + } + } + } + mapper.insert(application); + } + + /** + * {@inheritDoc} + */ + @Override + public void update(final ApplicationFormForUpdate form, final MultipartFile[] images) { + + } + + private String imageFolder(final String appId) { + return "app/" + appId; + } +} diff --git a/server/crm/src/main/resources/application_dev.properties b/server/crm/src/main/resources/application_dev.properties index e5d0400..640b085 100644 --- a/server/crm/src/main/resources/application_dev.properties +++ b/server/crm/src/main/resources/application_dev.properties @@ -16,3 +16,7 @@ shiro.session.validation.scheduler.enabled=true spring.http.multipart.max-file-size=1024MB spring.http.multipart.max-request-size=1024MB + +# File +file.base-path=http://127.0.0.1:${server.port}/f/ +file.base-dir=/Users/chyxion/Workspaces/ambition-crm/files/ diff --git a/server/crm/src/main/resources/shiro/auth.properties b/server/crm/src/main/resources/shiro/auth.properties index b6be8b6..e29b92b 100644 --- a/server/crm/src/main/resources/shiro/auth.properties +++ b/server/crm/src/main/resources/shiro/auth.properties @@ -2,4 +2,5 @@ /=anon /index.html=anon /assets/**=anon +/f/**=anon /**=user diff --git a/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java b/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java new file mode 100644 index 0000000..3b58247 --- /dev/null +++ b/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java @@ -0,0 +1,33 @@ +package com.pudonghot.ambition.crm.service; + +import java.io.File; +import org.junit.Test; +import org.junit.runner.RunWith; +import lombok.extern.slf4j.Slf4j; +import com.pudonghot.ambition.crm.AmbitionCRM; +import com.pudonghot.ambition.file.AmbitionFileApi; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 11, 2018 17:07:06 + */ +@Slf4j +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = AmbitionCRM.class) +public class DiskFileStoreTest { + + @Autowired + private AmbitionFileApi fileApi; + + @Test + public void testUpload() throws Exception { + final String foobar = fileApi.upload(new File("/Users/chyxion/Workspaces//Eclipse/Default/bzush-schoolmate-api/src/main/java/cn/edu/bzu/schoolmate/controllers/FileController.java"), "foobar"); + log.info("Upload result [{}].", foobar); + } +} diff --git a/server/file-api/pom.xml b/server/file-api/pom.xml index 67f5815..cde17ae 100644 --- a/server/file-api/pom.xml +++ b/server/file-api/pom.xml @@ -37,6 +37,11 @@ commons-io commons-io + + org.projectlombok + lombok + provided + org.springframework spring-context diff --git a/server/file-api/src/main/java/com/pudonghot/ambition/file/support/AbstractAmbitionFileApi.java b/server/file-api/src/main/java/com/pudonghot/ambition/file/support/AbstractAmbitionFileApi.java index ba751b3..6329dee 100644 --- a/server/file-api/src/main/java/com/pudonghot/ambition/file/support/AbstractAmbitionFileApi.java +++ b/server/file-api/src/main/java/com/pudonghot/ambition/file/support/AbstractAmbitionFileApi.java @@ -9,6 +9,7 @@ import java.util.LinkedList; import javax.imageio.ImageIO; import java.io.FileInputStream; import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,10 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired; * chyxion@163.com
* Sep 14, 2016 3:31:52 PM */ +@Slf4j public abstract class AbstractAmbitionFileApi implements AmbitionFileApi { - private static final Logger log = - LoggerFactory.getLogger(AbstractAmbitionFileApi.class); - @Autowired protected ImageTool imageTool; @Autowired diff --git a/server/file-disk/src/main/java/com/pudonghot/ambition/file/DiskFileApi.java b/server/file-disk/src/main/java/com/pudonghot/ambition/file/DiskFileApi.java new file mode 100644 index 0000000..db8dcf3 --- /dev/null +++ b/server/file-disk/src/main/java/com/pudonghot/ambition/file/DiskFileApi.java @@ -0,0 +1,9 @@ +package com.pudonghot.ambition.file.disk; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 11, 2018 18:13:51 + */ +public interface DiskFileApi { +} diff --git a/server/file-disk/src/main/java/com/pudonghot/ambition/file/disk/DiskFileSupport.java b/server/file-disk/src/main/java/com/pudonghot/ambition/file/disk/DiskFileSupport.java index fded5aa..bffba4b 100644 --- a/server/file-disk/src/main/java/com/pudonghot/ambition/file/disk/DiskFileSupport.java +++ b/server/file-disk/src/main/java/com/pudonghot/ambition/file/disk/DiskFileSupport.java @@ -33,7 +33,7 @@ public class DiskFileSupport @Autowired private FileInfoMapper fileInfoMapper; - @Value("${file.server.base-path}") + @Value("${file.base-path}") private String basePath; @Value("${file.base-dir}") private String baseDir; @@ -101,7 +101,7 @@ public class DiskFileSupport update = true; // delete previous file prevFile = new File(getFileDir(), fileInfo.getFilePath()); - log.info("Will Delete Previous File [{}].", prevFile); + log.info("Will delete previous file [{}].", prevFile); } else { fileInfo = new FileInfo(); @@ -127,13 +127,13 @@ public class DiskFileSupport } // File - log.info("Upload Input Stream With Name [{}].", fullName); + log.info("Upload input stream with name [{}].", fullName); OutputStream fout = null; try { // delete previous files if (prevFile != null) { FileUtils.deleteQuietly(prevFile); - log.info("Delete File [{}] Before Upload.", prevFile); + log.info("Delete file [{}] before upload.", prevFile); FileUtils.deleteQuietly(prevFile); } @@ -151,11 +151,12 @@ public class DiskFileSupport fout = new FileOutputStream(storeFile); IOUtils.copy(in, fout); - return getUrl(filePath); + // return getUrl(filePath); + return basePath + fullName; } catch (IOException e) { throw new IllegalStateException( - "Upload File [" + fullName + "] Error Caused", e); + "Upload file [" + fullName + "] error caused", e); } finally { IOUtils.closeQuietly(fout); @@ -168,10 +169,10 @@ public class DiskFileSupport */ @Override public File getFile(final String name) { - FileInfo fileInfo = fileInfoMapper.find(nameSearch(name)); + final FileInfo fileInfo = fileInfoMapper.find(nameSearch(name)); Assert.state(fileInfo != null, "No File [" + name + "] Found"); - return getFile(name, fileInfo.getFormat()); + return getFile(fileInfo.getFilePath(), fileInfo.getFormat()); } /** @@ -242,9 +243,9 @@ public class DiskFileSupport } String fullName = null; if (StringUtils.isNotBlank(name)) { - log.debug("Name [{}] Is Not Blank.", name); + log.debug("Name [{}] is not blank.", name); if (name.startsWith(basePath)) { - log.debug("Name Starts With Base Path [{}], Trim.", basePath); + log.debug("Name starts with base path [{}], trim.", basePath); fullName = name.replaceFirst(basePath, ""); } else if (StringUtils.isNotBlank(folder)) { diff --git a/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.java b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.java new file mode 100644 index 0000000..9165557 --- /dev/null +++ b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.java @@ -0,0 +1,13 @@ +package com.pudonghot.ambition.crm.mapper; + +import me.chyxion.tigon.mybatis.BaseMapper; +import com.pudonghot.ambition.crm.model.ApplicationImage; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 11, 2018 11:39:49 + */ +public interface ApplicationImageMapper extends BaseMapper { + +} diff --git a/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.xml b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.xml new file mode 100644 index 0000000..6bc8012 --- /dev/null +++ b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationImageMapper.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.java b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.java new file mode 100644 index 0000000..297fbbd --- /dev/null +++ b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.java @@ -0,0 +1,13 @@ +package com.pudonghot.ambition.crm.mapper; + +import me.chyxion.tigon.mybatis.BaseMapper; +import com.pudonghot.ambition.crm.model.Application; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 11, 2018 11:39:28 + */ +public interface ApplicationMapper extends BaseMapper { + +} diff --git a/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.xml b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.xml new file mode 100644 index 0000000..fad4c81 --- /dev/null +++ b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ApplicationMapper.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/form/create/ApplicationFormForCreate.java b/server/model/src/main/java/com/pudonghot/ambition/crm/form/create/ApplicationFormForCreate.java new file mode 100644 index 0000000..3206a18 --- /dev/null +++ b/server/model/src/main/java/com/pudonghot/ambition/crm/form/create/ApplicationFormForCreate.java @@ -0,0 +1,23 @@ +package com.pudonghot.ambition.crm.form.create; + +import lombok.Getter; +import lombok.Setter; +import me.chyxion.tigon.form.FC2; +import org.hibernate.validator.constraints.NotBlank; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 11, 2018 11:14:07 + */ +@Getter +@Setter +public class ApplicationFormForCreate extends FC2 { + private static final long serialVersionUID = 1L; + + // Properties + @NotBlank + private String name; + private String content; + private String owner; +} diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/form/update/ApplicationFormForUpdate.java b/server/model/src/main/java/com/pudonghot/ambition/crm/form/update/ApplicationFormForUpdate.java new file mode 100644 index 0000000..4b2e84f --- /dev/null +++ b/server/model/src/main/java/com/pudonghot/ambition/crm/form/update/ApplicationFormForUpdate.java @@ -0,0 +1,24 @@ +package com.pudonghot.ambition.crm.form.update; + +import lombok.Getter; +import lombok.Setter; +import me.chyxion.tigon.form.FU2; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.NotBlank; + +/** + * @version 0.0.1 + * @since 0.0.1 + * @author Shaun Chyxion
+ * chyxion@163.com
+ * May 10, 2016 1:42:01 PM + */ +@Getter +@Setter +public class ApplicationFormForUpdate extends FU2 { + private static final long serialVersionUID = 1L; + + @NotBlank + @Length(max = 64) + private String name; +} diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java b/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java new file mode 100644 index 0000000..0bf3057 --- /dev/null +++ b/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java @@ -0,0 +1,28 @@ +package com.pudonghot.ambition.crm.model; + +import lombok.Getter; +import lombok.Setter; +import me.chyxion.tigon.model.M3; +import me.chyxion.tigon.mybatis.Table; + +/** + * @author Donghuang
+ * donghuang@wacai.com
+ * Mar 06, 2018 22:48:13 + */ +@Getter +@Setter +@Table("crm_application") +public class Application extends M3 { + private static final long serialVersionUID = 1L; + + // Column Names + public static final String NAME = "name"; + public static final String CONTENT = "content"; + public static final String OWNER = "owner"; + + // Properties + private String name; + private String content; + private String owner; +} diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/model/ApplicationImage.java b/server/model/src/main/java/com/pudonghot/ambition/crm/model/ApplicationImage.java new file mode 100644 index 0000000..a371594 --- /dev/null +++ b/server/model/src/main/java/com/pudonghot/ambition/crm/model/ApplicationImage.java @@ -0,0 +1,26 @@ +package com.pudonghot.ambition.crm.model; + +import lombok.Getter; +import lombok.Setter; +import me.chyxion.tigon.model.M3; +import me.chyxion.tigon.mybatis.Table; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Mar 06, 2018 22:50:08 + */ +@Getter +@Setter +@Table("crm_application_image") +public class ApplicationImage extends M3 { + private static final long serialVersionUID = 1L; + + // Column Names + public static final String APPLICATION_ID = "application_id"; + public static final String SORT = "sort"; + + // Properties + private String applicationId; + private int sort; +}