From d24cbb6dd57f26399539c16be4cb8b80121249ad Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 23 Apr 2022 19:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgink/properties/form/FormProperties.java | 33 ------- .../file/media/manager/MediaManager.java | 3 +- .../api/report/FormReportController.java | 7 ++ .../design/FormDesignRouteController.java | 4 +- .../report/FormReportRouteController.java | 53 +++++++++-- .../service/design/IFormFieldService.java | 4 +- .../design/impl/FormDesignServiceImpl.java | 7 -- .../design/impl/FormFieldServiceImpl.java | 7 +- .../service/report/IFormReportService.java | 3 + .../report/impl/FormReportServiceImpl.java | 51 ++++++++--- .../mapper/form-report/form-report-mapper.xml | 11 ++- .../resources/templates/form-report/list.html | 90 ++++++++++++++++--- .../main/resources/templates/form/list.html | 10 +-- .../sms/pojo/vos/sms/SmsPhoneSendVO.java | 46 +--------- .../sms/pojo/vos/sms/SmsSendBaseVO.java | 37 ++++++++ .../module/sms/pojo/vos/sms/SmsSendVO.java | 14 +-- .../sms/service/sms/impl/SmsServiceImpl.java | 32 +++++-- 17 files changed, 262 insertions(+), 150 deletions(-) delete mode 100644 basic-properties/src/main/java/ink/wgink/properties/form/FormProperties.java create mode 100644 module-sms/src/main/java/ink/wgink/module/sms/pojo/vos/sms/SmsSendBaseVO.java diff --git a/basic-properties/src/main/java/ink/wgink/properties/form/FormProperties.java b/basic-properties/src/main/java/ink/wgink/properties/form/FormProperties.java deleted file mode 100644 index b6a5d27d..00000000 --- a/basic-properties/src/main/java/ink/wgink/properties/form/FormProperties.java +++ /dev/null @@ -1,33 +0,0 @@ -package ink.wgink.properties.form; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.io.File; - -/** - * @ClassName: FormProperties - * @Description: 表单属性 - * @Author: wanggeng - * @Date: 2022/3/10 4:17 PM - * @Version: 1.0 - */ -@Component -@ConfigurationProperties(prefix = "form") -public class FormProperties { - - private String templatePath; - - public String getTemplatePath() { - templatePath = templatePath == null ? "" : templatePath.trim(); - if (!StringUtils.isEmpty(templatePath) && !templatePath.endsWith(File.separator)) { - templatePath += File.separator; - } - return templatePath; - } - - public void setTemplatePath(String templatePath) { - this.templatePath = templatePath; - } -} diff --git a/module-file-media/src/main/java/ink/wgink/module/file/media/manager/MediaManager.java b/module-file-media/src/main/java/ink/wgink/module/file/media/manager/MediaManager.java index 36e39522..d77e5de6 100644 --- a/module-file-media/src/main/java/ink/wgink/module/file/media/manager/MediaManager.java +++ b/module-file-media/src/main/java/ink/wgink/module/file/media/manager/MediaManager.java @@ -170,7 +170,8 @@ public class MediaManager { return null; } LinkedList ffmpegCmds = new LinkedList<>(commonds); - ffmpegCmds.addFirst(FFMPEG_PATH); // 设置ffmpeg程序所在路径 + // 设置ffmpeg程序所在路径 + ffmpegCmds.addFirst(FFMPEG_PATH); LOG.info("--- 待执行的FFmpeg指令为：---" + ffmpegCmds); Runtime runtime = Runtime.getRuntime(); diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/api/report/FormReportController.java b/module-form/src/main/java/ink/wgink/module/form/controller/api/report/FormReportController.java index 254974aa..3479e0f2 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/api/report/FormReportController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/api/report/FormReportController.java @@ -68,6 +68,13 @@ public class FormReportController extends DefaultBaseController { return formReportService.listPage(formCode, formVersion, page); } + @GetMapping("listpage-all-fields/code/{formCode}/version/{formVersion}") + public SuccessResultList>> listPageAllField(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return formReportService.listPageAllField(formCode, formVersion, page); + } + @GetMapping("list-show-field/code/{formCode}/version/{formVersion}") public List listShowField(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { return formReportService.listShowField(formCode, formVersion); diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormDesignRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormDesignRouteController.java index 0793f21a..cb0b6c86 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormDesignRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormDesignRouteController.java @@ -20,13 +20,13 @@ public class FormDesignRouteController { @GetMapping("save") public ModelAndView save() { - ModelAndView mv = new ModelAndView("/form-design/save"); + ModelAndView mv = new ModelAndView("form-design/save"); return mv; } @GetMapping("update") public ModelAndView update() { - ModelAndView mv = new ModelAndView("/form-design/update"); + ModelAndView mv = new ModelAndView("form-design/update"); return mv; } diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java index c6da81b9..11839c28 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java @@ -1,6 +1,10 @@ package ink.wgink.module.form.controller.route.report; +import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.form.pojo.pos.design.FormPO; +import ink.wgink.module.form.service.design.IFormFieldService; +import ink.wgink.module.form.service.design.IFormService; import ink.wgink.module.form.service.report.IFormReportRouteService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -8,10 +12,15 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @ClassName: FormReportRouteController @@ -25,6 +34,10 @@ import javax.servlet.http.HttpSession; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/form-report") public class FormReportRouteController { + @Autowired + private IFormService formService; + @Autowired + private IFormFieldService formFieldService; @Autowired private IFormReportRouteService formReportService; @@ -39,20 +52,44 @@ public class FormReportRouteController { @GetMapping("update/code/{formCode}/version/{formVersion}") public void update(@PathVariable("formCode") String formCode, - @PathVariable("formVersion") Integer formVersion, - HttpSession httpSession, - HttpServletRequest httpServletRequest, - HttpServletResponse httpServletResponse) { + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { formReportService.update(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } @GetMapping("show/code/{formCode}/version/{formVersion}") public void show(@PathVariable("formCode") String formCode, - @PathVariable("formVersion") Integer formVersion, - HttpSession httpSession, - HttpServletRequest httpServletRequest, - HttpServletResponse httpServletResponse) { + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { formReportService.show(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } + @GetMapping("list/code/{formCode}/version/{formVersion}") + public ModelAndView list(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion) { + FormPO formPO = formService.getPOByCodeAndVersion(formCode, formVersion); + if (formPO == null) { + throw new SearchException("表单不存在"); + } + List> showFields = formFieldService.listByFormId(formPO.getFormId()).stream().map( + formFieldDTO -> { + Map showField = new HashMap<>(); + showField.put("fieldName", formFieldDTO.getFieldName()); + showField.put("fieldExplain", formFieldDTO.getFieldExplain()); + showField.put("fieldTag", formFieldDTO.getFieldTag()); + return showField; + } + ).collect(Collectors.toList()); + ModelAndView mv = new ModelAndView("form-report/list"); + mv.addObject("formCode", formCode); + mv.addObject("formVersion", formVersion); + mv.addObject("formType", formPO.getFormType()); + mv.addObject("showFields", showFields); + return mv; + } + } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java index 21bb57e9..55619e9f 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java @@ -127,8 +127,8 @@ public interface IFormFieldService { * 字段名列表 * * @param formId 表单ID - * @param listShow 列表显示状态 + * @param isListShow 列表显示状态 * @return */ - List listFieldNameByFormIdAndListShow(String formId, String listShow); + List listFieldNameByFormIdAndListShow(String formId, Boolean isListShow); } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java index 000e545c..613ce082 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java @@ -8,7 +8,6 @@ import freemarker.template.Template; import freemarker.template.TemplateException; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; -import ink.wgink.exceptions.PropertiesException; import ink.wgink.exceptions.base.SystemException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.consts.IFormDesignConst; @@ -21,7 +20,6 @@ import ink.wgink.module.form.pojo.vos.design.FormVO; import ink.wgink.module.form.service.design.IFormDesignService; import ink.wgink.module.form.service.design.IFormFieldService; import ink.wgink.module.form.service.design.IFormService; -import ink.wgink.properties.form.FormProperties; import ink.wgink.util.HtmlHelper; import ink.wgink.util.date.DateUtil; import org.apache.commons.lang3.StringUtils; @@ -45,8 +43,6 @@ import java.util.Map; @Service public class FormDesignServiceImpl extends DefaultBaseService implements IFormDesignService { - @Autowired - private FormProperties formProperties; @Autowired private IFormService formService; @Autowired @@ -60,9 +56,6 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe @Override public void save(FormDesignVO formDesignVO) throws IOException { - if (StringUtils.isBlank(formProperties.getTemplatePath())) { - throw new PropertiesException("未配置模板路径"); - } List formFields = new ArrayList<>(); setFormFieldList(formFields, formDesignVO.getData()); if (formFields.isEmpty()) { diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java index d1863c53..759852f4 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java @@ -3,6 +3,7 @@ package ink.wgink.module.form.service.design.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.dao.design.IFormFieldDao; import ink.wgink.module.form.pojo.dtos.design.FormFieldDTO; import ink.wgink.module.form.pojo.pos.design.FormFieldPO; @@ -121,10 +122,12 @@ public class FormFieldServiceImpl extends DefaultBaseService implements IFormFie } @Override - public List listFieldNameByFormIdAndListShow(String formId, String listShow) { + public List listFieldNameByFormIdAndListShow(String formId, Boolean isListShow) { Map params = getHashMap(2); params.put("formId", formId); - params.put("listShow", listShow); + params.put("listShow", isListShow ? ISystemConstant.IS_TRUE : ISystemConstant.IS_FALSE); return listFieldName(params); } + + } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java index 637a9a56..f49b77ff 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java @@ -43,7 +43,10 @@ public interface IFormReportService { SuccessResultList>> listPage(String formCode, Integer formVersion, ListPage page); + SuccessResultList>> listPageAllField(String formCode, Integer formVersion, ListPage page); + List listShowField(String formCode, Integer formVersion); Integer count(String tableName); + } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java index fd04a54a..b49b6074 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; -import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.dao.formreport.IFormReportDao; import ink.wgink.module.form.enums.design.FormStatusEnum; import ink.wgink.module.form.pojo.pos.design.FormPO; @@ -20,10 +19,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.sql.Timestamp; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -201,20 +198,52 @@ public class FormReportServiceImpl extends DefaultBaseService implements IFormRe public SuccessResultList>> listPage(String formCode, Integer formVersion, ListPage page) { FormPO formPO = formService.getPOByCodeAndVersion(formCode, formVersion); checkForm(formPO); - List queryList = conditionList(page.getParams()); - Map queryParams = getHashMap(6); - queryParams.put(IFormDesignService.PARAM_FORM_CODE, formCode); - queryParams.put(IFormDesignService.PARAM_FORM_VERSION, formVersion); - queryParams.put(IFormDesignService.PARAM_QUERY_LIST, queryList); + Map queryParams = getListQueryParams(formPO, queryList); queryParams.put(IFormDesignService.PARAM_LIST_SHOW_FIELD, listShowField(formPO)); + return listPage(page, queryParams); + } + @Override + public SuccessResultList>> listPageAllField(String formCode, Integer formVersion, ListPage page) { + FormPO formPO = formService.getPOByCodeAndVersion(formCode, formVersion); + checkForm(formPO); + List queryList = conditionList(page.getParams()); + Map queryParams = getListQueryParams(formPO, queryList); + return listPage(page, queryParams); + } + + private SuccessResultList>> listPage(ListPage page, Map queryParams) { PageHelper.startPage(page.getPage(), page.getRows()); List> mapList = formReportDao.list(queryParams); + mapList.forEach(map -> { + if (map.containsKey(IFormDesignService.FIELD_GMT_CREATE) && map.get(IFormDesignService.FIELD_GMT_CREATE) != null) { + map.put(IFormDesignService.FIELD_GMT_CREATE, DateUtil.getDateTime(new Date(((Timestamp) map.get(IFormDesignService.FIELD_GMT_CREATE)).getTime()))); + } + if (map.containsKey(IFormDesignService.FIELD_GMT_MODIFIED) && map.get(IFormDesignService.FIELD_GMT_MODIFIED) != null) { + map.put(IFormDesignService.FIELD_GMT_MODIFIED, DateUtil.getDateTime(new Date(((Timestamp) map.get(IFormDesignService.FIELD_GMT_MODIFIED)).getTime()))); + } + }); PageInfo> pageInfo = new PageInfo<>(mapList); return new SuccessResultList<>(mapList, pageInfo.getPageNum(), pageInfo.getTotal()); } + /** + * 获取列表查询参数 + * + * @param formCode + * @param formVersion + * @param queryList + * @return + */ + private Map getListQueryParams(FormPO formPO, List queryList) { + Map queryParams = getHashMap(6); + queryParams.put(IFormDesignService.PARAM_FORM_CODE, formPO.getFormCode()); + queryParams.put(IFormDesignService.PARAM_FORM_VERSION, formPO.getFormVersion()); + queryParams.put(IFormDesignService.PARAM_QUERY_LIST, queryList); + return queryParams; + } + @Override public List listShowField(String formCode, Integer formVersion) { FormPO formPO = formService.getPOByCodeAndVersion(formCode, formVersion); @@ -249,7 +278,7 @@ public class FormReportServiceImpl extends DefaultBaseService implements IFormRe * @return */ private List listShowField(FormPO formPO) { - return formFieldService.listFieldNameByFormIdAndListShow(formPO.getFormId(), ISystemConstant.IS_TRUE); + return formFieldService.listFieldNameByFormIdAndListShow(formPO.getFormId(), true); } /** diff --git a/module-form/src/main/resources/mybatis/mapper/form-report/form-report-mapper.xml b/module-form/src/main/resources/mybatis/mapper/form-report/form-report-mapper.xml index 52a8d6b7..e5c24c85 100644 --- a/module-form/src/main/resources/mybatis/mapper/form-report/form-report-mapper.xml +++ b/module-form/src/main/resources/mybatis/mapper/form-report/form-report-mapper.xml @@ -66,10 +66,17 @@